diff options
Diffstat (limited to 'vcpkg/ports/fann')
| -rw-r--r-- | vcpkg/ports/fann/fix-build_type.patch | 12 | ||||
| -rw-r--r-- | vcpkg/ports/fann/fix-installation.patch | 35 | ||||
| -rw-r--r-- | vcpkg/ports/fann/fix-uwp-build.patch | 15 | ||||
| -rw-r--r-- | vcpkg/ports/fann/portfile.cmake | 64 | ||||
| -rw-r--r-- | vcpkg/ports/fann/remove-nouse-target.patch | 85 | ||||
| -rw-r--r-- | vcpkg/ports/fann/vcpkg.json | 17 |
6 files changed, 228 insertions, 0 deletions
diff --git a/vcpkg/ports/fann/fix-build_type.patch b/vcpkg/ports/fann/fix-build_type.patch new file mode 100644 index 0000000..14af5c8 --- /dev/null +++ b/vcpkg/ports/fann/fix-build_type.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2c35ea2..fafd904 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -68,7 +68,6 @@ set (FANN_VERSION_MINOR 2) + set (FANN_VERSION_PATCH 0) + set (FANN_VERSION_STRING ${FANN_VERSION_MAJOR}.${FANN_VERSION_MINOR}.${FANN_VERSION_PATCH}) + +-option(BUILD_SHARED_LIBS "build shared/static libs" ON) + + INCLUDE(DefineInstallationPaths) + diff --git a/vcpkg/ports/fann/fix-installation.patch b/vcpkg/ports/fann/fix-installation.patch new file mode 100644 index 0000000..3a7dae2 --- /dev/null +++ b/vcpkg/ports/fann/fix-installation.patch @@ -0,0 +1,35 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 12ea06c..6c33c25 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -156,10 +156,5 @@ install (FILES + + ################# compile tests ################ + +-ADD_SUBDIRECTORY( lib/googletest ) +- +-if(COMPILER_SUPPORTS_CXX11) +- ADD_SUBDIRECTORY( tests ) +-endif() + + ENDIF() +diff --git a/cmake/Modules/DefineInstallationPaths.cmake b/cmake/Modules/DefineInstallationPaths.cmake +index 2969533..e70c4b7 100644 +--- a/cmake/Modules/DefineInstallationPaths.cmake ++++ b/cmake/Modules/DefineInstallationPaths.cmake +@@ -127,7 +127,7 @@ if (UNIX OR MINGW OR WIN32) + set (PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "pkgconfig dir" FORCE) + endif () + +-if (MSCV) ++if (0) + # Same same + SET(BIN_INSTALL_DIR .) + SET(SBIN_INSTALL_DIR .) +@@ -137,5 +137,5 @@ if (MSCV) + SET(ICON_INSTALL_DIR .) + SET(SOUND_INSTALL_DIR .) + SET(LOCALE_INSTALL_DIR lang) +-endif (MSCV) ++endif () + diff --git a/vcpkg/ports/fann/fix-uwp-build.patch b/vcpkg/ports/fann/fix-uwp-build.patch new file mode 100644 index 0000000..bcd12e1 --- /dev/null +++ b/vcpkg/ports/fann/fix-uwp-build.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6c33c25..2c35ea2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -82,6 +82,10 @@ configure_file (cmake/fann.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/fann.pc @ONLY) + + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/fann.pc DESTINATION ${PKGCONFIG_INSTALL_DIR}) + ++if (MSVC) ++ add_compile_options(/wd4996) ++endif() ++ + ADD_SUBDIRECTORY( src ) + + ################# cpack ################ diff --git a/vcpkg/ports/fann/portfile.cmake b/vcpkg/ports/fann/portfile.cmake new file mode 100644 index 0000000..b182969 --- /dev/null +++ b/vcpkg/ports/fann/portfile.cmake @@ -0,0 +1,64 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libfann/fann + REF 8409b42d308bf9428b9d3e60927595e53a797bbc + SHA512 4ad66808d7c88911d4c6d63368240ece2d0cbc73d89a95d32261b95dc551c47c46b3a34cc81b8cb0e03fe3f9ea61cb304e028780357bcf332d660824b066fd1e + HEAD_REF master + PATCHES + fix-installation.patch + fix-uwp-build.patch + fix-build_type.patch + remove-nouse-target.patch +) + +set(INSTALL_BASE_DIR_DBG "${CURRENT_PACKAGES_DIR}/debug") +set(INSTALL_BASE_DIR_REL "${CURRENT_PACKAGES_DIR}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DBIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/bin + -DSBIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/sbin + -DLIB_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/lib + -DEXEC_INSTALL_PREFIX=${INSTALL_BASE_DIR_DBG}/tools/${PORT} + -DXDG_APPS_DIR=${INSTALL_BASE_DIR_DBG}/tools/${PORT} + -DPLUGIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/tools/${PORT} + -DINCLUDE_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/include + -DSHARE_INSTALL_PREFIX=${INSTALL_BASE_DIR_DBG}/share/${PORT} + -DDATA_INSTALL_PREFIX=${INSTALL_BASE_DIR_DBG}/share/${PORT} + -DHTML_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/share/${PORT}/doc + -DICON_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/share/${PORT}/data/icons + -DSOUND_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/share/${PORT}/sounds + -DLOCALE_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/share/${PORT}/locale + -DSYSCONF_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/share/${PORT}/etc + -DINFO_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/share/${PORT}/info + OPTIONS_RELEASE + -DBIN_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/bin + -DSBIN_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/sbin + -DLIB_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/lib + -DEXEC_INSTALL_PREFIX=${INSTALL_BASE_DIR_REL}/tools/${PORT} + -DXDG_APPS_DIR=${INSTALL_BASE_DIR_REL}/tools/${PORT} + -DPLUGIN_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/tools/${PORT} + -DINCLUDE_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/include + -DSHARE_INSTALL_PREFIX=${INSTALL_BASE_DIR_REL}/share/${PORT} + -DDATA_INSTALL_PREFIX=${INSTALL_BASE_DIR_REL}/share/${PORT} + -DHTML_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/share/${PORT}/doc + -DICON_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/share/${PORT}/data/icons + -DSOUND_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/share/${PORT}/sounds + -DLOCALE_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/share/${PORT}/locale + -DSYSCONF_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/share/${PORT}/etc + -DINFO_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/share/${PORT}/info +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/vcpkg/ports/fann/remove-nouse-target.patch b/vcpkg/ports/fann/remove-nouse-target.patch new file mode 100644 index 0000000..82a2666 --- /dev/null +++ b/vcpkg/ports/fann/remove-nouse-target.patch @@ -0,0 +1,85 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index ac3ff73..2fb9a59 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -23,15 +23,12 @@ SET(floatfann_LIB_SRCS + floatfann.c + ) + +-ADD_LIBRARY(floatfann SHARED ${floatfann_LIB_SRCS}) +-ADD_LIBRARY(floatfann_static STATIC ${floatfann_LIB_SRCS}) ++ADD_LIBRARY(floatfann ${floatfann_LIB_SRCS}) + + SET_TARGET_PROPERTIES(floatfann PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) +-SET_TARGET_PROPERTIES(floatfann_static PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) + if (UNIX) +- SET_TARGET_PROPERTIES(floatfann_static PROPERTIES OUTPUT_NAME floatfann) + endif(UNIX) +-INSTALL(TARGETS floatfann floatfann_static LIBRARY DESTINATION ${LIB_INSTALL_DIR} ++INSTALL(TARGETS floatfann LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION ${BIN_INSTALL_DIR} ) + +@@ -42,15 +39,12 @@ SET(doublefann_LIB_SRCS + doublefann.c + ) + +-ADD_LIBRARY(doublefann SHARED ${doublefann_LIB_SRCS}) +-ADD_LIBRARY(doublefann_static STATIC ${doublefann_LIB_SRCS}) ++ADD_LIBRARY(doublefann ${doublefann_LIB_SRCS}) + + SET_TARGET_PROPERTIES(doublefann PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) +-SET_TARGET_PROPERTIES(doublefann_static PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) + if (UNIX) +- SET_TARGET_PROPERTIES(doublefann_static PROPERTIES OUTPUT_NAME doublefann) + endif(UNIX) +-INSTALL(TARGETS doublefann doublefann_static LIBRARY DESTINATION ${LIB_INSTALL_DIR} ++INSTALL(TARGETS doublefann LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION ${BIN_INSTALL_DIR} ) + +@@ -61,20 +55,16 @@ SET(fixedfann_LIB_SRCS + fixedfann.c + ) + +-ADD_LIBRARY(fixedfann SHARED ${fixedfann_LIB_SRCS}) +-ADD_LIBRARY(fixedfann_static STATIC ${fixedfann_LIB_SRCS}) ++ADD_LIBRARY(fixedfann ${fixedfann_LIB_SRCS}) + + if(NOT MSVC) + TARGET_LINK_LIBRARIES(fixedfann m) +-TARGET_LINK_LIBRARIES(fixedfann_static m) + endif(NOT MSVC) + + SET_TARGET_PROPERTIES(fixedfann PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) +-SET_TARGET_PROPERTIES(fixedfann_static PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) + if (UNIX) +- SET_TARGET_PROPERTIES(fixedfann_static PROPERTIES OUTPUT_NAME fixedfann) + endif(UNIX) +-INSTALL(TARGETS fixedfann fixedfann_static LIBRARY DESTINATION ${LIB_INSTALL_DIR} ++INSTALL(TARGETS fixedfann LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION ${BIN_INSTALL_DIR} ) + +@@ -85,19 +75,15 @@ SET(fann_LIB_SRCS + floatfann.c + ) + +-ADD_LIBRARY(fann SHARED ${fann_LIB_SRCS}) +-ADD_LIBRARY(fann_static STATIC ${fann_LIB_SRCS}) ++ADD_LIBRARY(fann ${fann_LIB_SRCS}) + + if(NOT MSVC) + TARGET_LINK_LIBRARIES(fann m) +-TARGET_LINK_LIBRARIES(fann_static m) + endif(NOT MSVC) + + SET_TARGET_PROPERTIES(fann PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) +-SET_TARGET_PROPERTIES(fann_static PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) + if (UNIX) +- SET_TARGET_PROPERTIES(fann_static PROPERTIES OUTPUT_NAME fann) + endif(UNIX) +-INSTALL(TARGETS fann fann_static LIBRARY DESTINATION ${LIB_INSTALL_DIR} ++INSTALL(TARGETS fann LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/vcpkg/ports/fann/vcpkg.json b/vcpkg/ports/fann/vcpkg.json new file mode 100644 index 0000000..0441b07 --- /dev/null +++ b/vcpkg/ports/fann/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "fann", + "version-date": "2023-01-26", + "description": "Fast Artificial Neural Network (FANN) Library is a free open source neural network library, which implements multilayer artificial neural networks in C with support for both fully connected and sparsely connected networks.", + "homepage": "https://github.com/libfann/fann", + "license": "LGPL-2.1-only", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} |