From 1423ff23e2851306c47492f3bbaa1fd8a2872fa4 Mon Sep 17 00:00:00 2001 From: BLigart Date: Sun, 18 Mar 2018 10:19:57 +0100 Subject: [PATCH 1/2] Update for MSVC 2017, remove unused variable _ARG_INTO, change install for ATestModule --- CMakeLists.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02fefd0..a694a8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,10 @@ cmake_minimum_required ( VERSION 2.8 ) include ( cmake/dist.cmake ) include ( lua ) +if( MSVC ) + set( CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE ) +endif() + # Find Lua find_package ( Lua REQUIRED ) @@ -42,7 +46,7 @@ set(DiluculumSources Sources/LuaVariable.cpp Sources/LuaWrappers.cpp) -add_library ( diluculum ${DiluculumSources} ) +add_library ( diluculum SHARED ${DiluculumSources} ) target_link_libraries ( diluculum ${LUA_LIBRARIES} ) # Add CTest support @@ -56,14 +60,17 @@ function(AddUnitTest name) ${LUA_LIBRARIES} diluculum ) add_test ( ${name} ${name} ) - install ( TARGETS ${name} RUNTIME DESTINATION ${INSTALL_TEST}/${_ARG_INTO} + install ( TARGETS ${name} RUNTIME DESTINATION ${INSTALL_TEST}/ COMPONENT Test ) endfunction ( AddUnitTest ) add_library ( ATestModule SHARED Tests/ATestModule.cpp ) target_link_libraries ( ATestModule diluculum ${LUA_LIBRARIES} ) set_target_properties ( ATestModule PROPERTIES PREFIX "" ) -install ( TARGETS ATestModule LIBRARY DESTINATION ${INSTALL_TEST}/${_ARG_INTO} COMPONENT Test ) +install ( TARGETS ATestModule + RUNTIME DESTINATION ${INSTALL_TEST} COMPONENT Runtime + LIBRARY DESTINATION ${INSTALL_TEST} COMPONENT Runtime + ARCHIVE DESTINATION ${INSTALL_TEST} COMPONENT Library ) addunittest ( TestLuaFunction ) addunittest ( TestLuaState ) From 2bb65650e368d84e2b42e336665055189d0c7d1f Mon Sep 17 00:00:00 2001 From: KrupsonSVK Date: Mon, 30 Apr 2018 21:31:51 +0200 Subject: [PATCH 2/2] [BUILD] fixed typo in boost static build var --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a694a8e..0502f76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ endif() find_package ( Lua REQUIRED ) # Find Boost -set ( Booqst_USE_STATIC_LIBS OFF) +set ( Boost_USE_STATIC_LIBS OFF) find_package ( Boost 1.39 COMPONENTS unit_test_framework REQUIRED ) add_definitions ( -DBOOST_ALL_DYN_LINK )