collabvm/r3
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

test cmake change for broken travis build

Browse source
This commit is contained in:
simon-p-r 2018-09-18 10:02:10 +01:00
parent 5bcb073aec
commit a2cdbb5f7c
No known key found for this signature in database
GPG key ID: 242BD4242D286274
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/Modules/FindCheck.cmake
View file

@ -49,7 +49,7 @@ IF( NOT CHECK_FOUND AND NOT PKG_CONFIG_FOUND )
MESSAGE( STATUS "Could NOT find CHECK" ) MESSAGE( STATUS "Could NOT find CHECK" )
ENDIF ( NOT Check_FIND_QUIETLY ) ENDIF ( NOT Check_FIND_QUIETLY )
ENDIF ( Check_FIND_REQUIRED ) ENDIF ( Check_FIND_REQUIRED )
ENDIF ( CHECK_INCLUDE_DIRS AND CHECK_LIBRARIES ) ENDIF ( CHECK_INCLUDE_DIRS AND CHECK_LIBRARY )
ENDIF( NOT CHECK_FOUND AND NOT PKG_CONFIG_FOUND ) ENDIF( NOT CHECK_FOUND AND NOT PKG_CONFIG_FOUND )
# Hide advanced variables from CMake GUIs # Hide advanced variables from CMake GUIs

3
tests/CMakeLists.txt
View file

@ -2,6 +2,7 @@ function(add_r3_test NAME)
add_executable(${NAME} ${ARGN}) add_executable(${NAME} ${ARGN})
if(WIN32) if(WIN32)
set(CHECK_LDFLAGS ${CHECK_LIBRARIES})
target_compile_definitions(${NAME} target_compile_definitions(${NAME}
PRIVATE PRIVATE
_CRT_SECURE_NO_WARNINGS _CRT_SECURE_NO_WARNINGS
@ -15,7 +16,7 @@ function(add_r3_test NAME)
${PROJECT_SOURCE_DIR}/src) ${PROJECT_SOURCE_DIR}/src)
target_link_libraries(${NAME} target_link_libraries(${NAME}
${CHECK_LIBRARIES} ${CHECK_LDFLAGS}
r3) r3)
add_test(NAME ${NAME} COMMAND ${NAME}) add_test(NAME ${NAME} COMMAND ${NAME})