King_DuckZ/dindexer
1
0
Fork 0
mirror of https://github.com/KingDuckZ/dindexer.git synced 2024-12-03 02:15:41 +00:00
Code Issues Releases Wiki Activity

Include CTest instead of calling enable_testing() manually

Browse source
This commit is contained in:
King_DuckZ 2016-04-26 20:45:49 +02:00
parent 609f5db623
commit a9bb28d0a8
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -19,6 +19,7 @@ include(GetGitRevisionDescription)
include(Buildlibpqtypes) include(Buildlibpqtypes)
include(gccversion) include(gccversion)
include(CPack) include(CPack)
include(CTest)
include(timestamp) include(timestamp)
option(DINDEXER_DEBUG_CFG_FILE "Enable to set the config file path to the build path" OFF) option(DINDEXER_DEBUG_CFG_FILE "Enable to set the config file path to the build path" OFF)
@ -114,7 +115,6 @@ add_subdirectory(src/navigate)
#Tests #Tests
if (BUILD_TESTING) if (BUILD_TESTING)
enable_testing()
add_subdirectory(test/gtest) add_subdirectory(test/gtest)
add_subdirectory(test/unit) add_subdirectory(test/unit)
add_subdirectory(test/unit_cli) add_subdirectory(test/unit_cli)

9
lib/pbl/CMakeLists.txt
View file

@ -6,10 +6,9 @@ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wall -O3")
option(PBL_WITH_TESTS "Enable building test programs" ON) option(PBL_WITH_TESTS "Enable building test programs" ON)
#add_library(${PROJECT_NAME} INTERFACE) if (PBL_WITH_TESTS)
#target_include_directories(${PROJECT_NAME} include(CTest)
# INTERFACE . endif()
#)
add_library(pbl STATIC add_library(pbl STATIC
pbl/src/src/pblStringBuilder.c pbl/src/src/pblStringBuilder.c
@ -33,8 +32,6 @@ target_compile_definitions(pbl
) )
if (BUILD_TESTING AND PBL_WITH_TESTS) if (BUILD_TESTING AND PBL_WITH_TESTS)
enable_testing()
set(pbl_tests set(pbl_tests
httst httst
#kftst #kftst