Skip to content
This repository has been archived by the owner on Nov 20, 2020. It is now read-only.

Update for MSVC 2017, remove unused variable _ARG_INTO, change instal… #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update for MSVC 2017, remove unused variable _ARG_INTO, change instal… #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1423ff2
Update for MSVC 2017, remove unused variable _ARG_INTO, change instal…
BLigart Mar 18, 2018
2bb6565
[BUILD] fixed typo in boost static build var
Apr 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,15 @@ 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 )

# 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 )

Expand Down Expand Up @@ -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
Expand All @@ -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 )
Expand Down