immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modernize CMake (3): hippomocks (make it into a real cmake library)

modernize-cmake-1
immibis 2020-07-04 17:03:29 +02:00
parent cbd2108eec
commit 1f2f857221
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -455,8 +455,7 @@ if(TESTS)
add_subdirectory(${GTEST_SRC_DIR} lib/gtest) add_subdirectory(${GTEST_SRC_DIR} lib/gtest)
# Hippomocks library add_subdirectory(lib/hippomocks)
set(HIPPOMOCKS_INCLUDE_DIR ${colobot_SOURCE_DIR}/lib/hippomocks)
# Tests targets # Tests targets
enable_testing() enable_testing()

4
lib/hippomocks/CMakeLists.txt Normal file
View File

@ -0,0 +1,4 @@
cmake_minimum_required(VERSION 3.13)
add_library(hippomocks INTERFACE)
target_include_directories(hippomocks SYSTEM INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)

3
test/unit/CMakeLists.txt
View File

@ -32,7 +32,6 @@ include_directories(
include_directories( include_directories(
SYSTEM SYSTEM
${GTEST_INCLUDE_DIR} ${GTEST_INCLUDE_DIR}
${HIPPOMOCKS_INCLUDE_DIR}
${COLOBOT_SYSTEM_INCLUDES} ${COLOBOT_SYSTEM_INCLUDES}
) )
@ -56,7 +55,7 @@ file(COPY ${TEST_FILES} DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
add_definitions(-DGTEST_HAS_TR1_TUPLE=0) add_definitions(-DGTEST_HAS_TR1_TUPLE=0)
add_executable(colobot_ut ${UT_SOURCES}) add_executable(colobot_ut ${UT_SOURCES})
target_link_libraries(colobot_ut ${LIBS}) target_link_libraries(colobot_ut ${LIBS} hippomocks)
add_test( add_test(
NAME colobot_ut NAME colobot_ut