Commit 89850de6 by Maarten L. Hekkelman

export symbols in windows

parent 8bb4ebd8
...@@ -24,11 +24,11 @@ if(CMAKE_COMPILER_IS_GNUCC) ...@@ -24,11 +24,11 @@ if(CMAKE_COMPILER_IS_GNUCC)
endif() endif()
if(MSVC) if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
endif() endif()
# Build shared libraries by default (not my cup of tea, but hey) # Build shared libraries by default (not my cup of tea, but hey)
option(BUILD_SHARED_LIBS "Build a shared library instead of a static one" ON) option(BUILD_SHARED_LIBS "Build a shared library instead of a static one" ON)
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
set(CMAKE_DEBUG_POSTFIX d) set(CMAKE_DEBUG_POSTFIX d)
...@@ -226,6 +226,11 @@ install(TARGETS cifpp ...@@ -226,6 +226,11 @@ install(TARGETS cifpp
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
export(EXPORT cifppTargets
FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/cifppTargets.cmake"
NAMESPACE cifpp::
)
install( install(
DIRECTORY include/cif++ DIRECTORY include/cif++
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
...@@ -246,7 +251,7 @@ install(FILES ...@@ -246,7 +251,7 @@ install(FILES
) )
configure_package_config_file(Config.cmake.in configure_package_config_file(Config.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/cifppConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/cifpp/cifppConfig.cmake
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cifpp INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cifpp
PATH_VARS INCLUDE_INSTALL_DIR LIBRARY_INSTALL_DIR SHARE_INSTALL_DIR PATH_VARS INCLUDE_INSTALL_DIR LIBRARY_INSTALL_DIR SHARE_INSTALL_DIR
) )
...@@ -274,11 +279,6 @@ write_basic_package_version_file( ...@@ -274,11 +279,6 @@ write_basic_package_version_file(
COMPATIBILITY AnyNewerVersion COMPATIBILITY AnyNewerVersion
) )
export(EXPORT cifppTargets
FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/cifppTargets.cmake"
NAMESPACE cifpp::
)
# Unit tests # Unit tests
option(CIFPP_BUILD_TESTS "Build test exectuables" OFF) option(CIFPP_BUILD_TESTS "Build test exectuables" OFF)
...@@ -308,7 +308,7 @@ if(CIFPP_BUILD_TESTS) ...@@ -308,7 +308,7 @@ if(CIFPP_BUILD_TESTS)
${CMAKE_CURRENT_BINARY_DIR} # for config.h ${CMAKE_CURRENT_BINARY_DIR} # for config.h
) )
target_link_libraries(${CIFPP_TEST} cifpp Threads::Threads ${Boost_LIBRARIES}) target_link_libraries(${CIFPP_TEST} Threads::Threads ${Boost_LIBRARIES} cifpp)
if(${ZLIB_FOUND}) if(${ZLIB_FOUND})
target_link_libraries(${CIFPP_TEST} ZLIB::ZLIB) target_link_libraries(${CIFPP_TEST} ZLIB::ZLIB)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment