Mercurial > irccd
changeset 76:7e9a1faeb6f6
CMake: temporarily disable CMake export as it requires Ph.D
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Wed, 30 Mar 2016 14:17:23 +0200 |
| parents | f8160d515a76 |
| children | c5f4ca941f79 |
| files | extern/libircclient/CMakeLists.txt lib/CMakeLists.txt |
| diffstat | 2 files changed, 36 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/extern/libircclient/CMakeLists.txt Wed Mar 30 13:52:47 2016 +0200 +++ b/extern/libircclient/CMakeLists.txt Wed Mar 30 14:17:23 2016 +0200 @@ -46,6 +46,10 @@ list(APPEND FLAGS "ENABLE_IPV6") endif () +if (WIN32) + list(APPEND LIBRARIES ws2_32) +endif () + irccd_define_library( LOCAL TARGET extern-ircclient
--- a/lib/CMakeLists.txt Wed Mar 30 13:52:47 2016 +0200 +++ b/lib/CMakeLists.txt Wed Mar 30 14:17:23 2016 +0200 @@ -39,8 +39,7 @@ list(APPEND LIBRARIES resolv) endif () -target_link_libraries(libirccd PRIVATE extern-duktape extern-ircclient extern-jansson) -target_link_libraries(libirccd ${LIBRARIES}) +target_link_libraries(libirccd extern-duktape extern-ircclient extern-jansson ${LIBRARIES}) set_target_properties( libirccd @@ -53,49 +52,49 @@ install( TARGETS libirccd - EXPORT Irccd2Targets +# EXPORT Irccd2Targets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) -# CMake target exports. -export( - EXPORT Irccd2Targets - FILE "${CMAKE_BINARY_DIR}/Irccd2Targets.cmake" - NAMESPACE Irccd2:: -) +# # CMake target exports. +# export( +# EXPORT Irccd2Targets +# FILE "${CMAKE_BINARY_DIR}/Irccd2Targets.cmake" +# NAMESPACE Irccd2:: +# ) # CMake version file. -include(CMakePackageConfigHelpers) +# include(CMakePackageConfigHelpers) -write_basic_package_version_file( - "${CMAKE_CURRENT_BINARY_DIR}/Irccd2ConfigVersion.cmake" - VERSION ${IRCCD_VERSION} - COMPATIBILITY AnyNewerVersion -) +# write_basic_package_version_file( +# "${CMAKE_CURRENT_BINARY_DIR}/Irccd2ConfigVersion.cmake" +# VERSION ${IRCCD_VERSION} +# COMPATIBILITY AnyNewerVersion +# ) # Irccd main module file. -configure_file( - "${CMAKE_SOURCE_DIR}/cmake/internal/Irccd2Config.cmake.in" - "${CMAKE_BINARY_DIR}/Irccd2Config.cmake" - COPYONLY -) +# configure_file( +# "${CMAKE_SOURCE_DIR}/cmake/internal/Irccd2Config.cmake.in" +# "${CMAKE_BINARY_DIR}/Irccd2Config.cmake" +# COPYONLY +# ) # Install all CMake stuff. -install( - EXPORT Irccd2Targets - FILE Irccd2Targets.cmake - NAMESPACE Irccd2:: - DESTINATION ${WITH_CMAKEDIR}/Irccd2 -) - -install( - FILES - "${CMAKE_BINARY_DIR}/Irccd2Config.cmake" - "${CMAKE_BINARY_DIR}/Irccd2ConfigVersion.cmake" - DESTINATION ${WITH_CMAKEDIR}/Irccd2 -) +# install( +# EXPORT Irccd2Targets +# FILE Irccd2Targets.cmake +# NAMESPACE Irccd2:: +# DESTINATION ${WITH_CMAKEDIR}/Irccd2 +# ) +# +# install( +# FILES +# "${CMAKE_BINARY_DIR}/Irccd2Config.cmake" +# "${CMAKE_BINARY_DIR}/Irccd2ConfigVersion.cmake" +# DESTINATION ${WITH_CMAKEDIR}/Irccd2 +# ) # pkg-config if (WITH_PKGCONFIG)