Split tests into samples & tests.

Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
This commit is contained in:
FrancisANDRE
2015-12-19 17:15:55 +01:00
parent 1c89dc5c97
commit 6e97a9f11b
17 changed files with 52 additions and 18 deletions

View File

@@ -21,6 +21,6 @@ target_include_directories( "${LIBNAME}"
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
)
if (ENABLE_TESTS)
if (ENABLE_SAMPLES)
add_subdirectory(samples)
endif ()

View File

@@ -25,7 +25,9 @@ target_include_directories( "${LIBNAME}"
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/src
${OPENSSL_INCLUDE_DIR}
)
target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
@@ -33,6 +35,8 @@ POCO_INSTALL("${LIBNAME}")
POCO_GENERATE_PACKAGE("${LIBNAME}")
if (ENABLE_TESTS)
add_subdirectory(samples)
add_subdirectory(testsuite)
endif ()
if (ENABLE_SAMPLES)
add_subdirectory(samples)
endif ()

View File

@@ -73,6 +73,8 @@ if(ENABLE_DATA_ODBC)
endif(ENABLE_DATA_ODBC)
if (ENABLE_TESTS)
add_subdirectory(samples)
add_subdirectory(testsuite)
endif ()
if (ENABLE_SAMPLES)
add_subdirectory(samples)
endif ()

View File

@@ -174,7 +174,9 @@ POCO_INSTALL("${LIBNAME}")
POCO_GENERATE_PACKAGE("${LIBNAME}")
if (ENABLE_TESTS)
add_subdirectory( samples )
add_subdirectory( testsuite )
endif ()
if (ENABLE_SAMPLES)
add_subdirectory( samples )
endif ()

View File

@@ -31,7 +31,9 @@ POCO_INSTALL("${LIBNAME}")
POCO_GENERATE_PACKAGE("${LIBNAME}")
if (ENABLE_TESTS)
add_subdirectory(samples)
add_subdirectory(testsuite)
endif ()
if (ENABLE_SAMPLES)
add_subdirectory(samples)
endif ()

View File

@@ -31,7 +31,9 @@ POCO_INSTALL("${LIBNAME}")
POCO_GENERATE_PACKAGE("${LIBNAME}")
if (ENABLE_TESTS)
add_subdirectory(samples)
add_subdirectory(testsuite)
endif ()
if (ENABLE_SAMPLES)
add_subdirectory(samples)
endif ()

View File

@@ -41,6 +41,8 @@ POCO_GENERATE_PACKAGE("${LIBNAME}")
if (ENABLE_TESTS)
add_subdirectory(samples)
add_subdirectory(testsuite)
endif ()
if (ENABLE_SAMPLES)
add_subdirectory(samples)
endif ()

View File

@@ -31,7 +31,9 @@ POCO_INSTALL("${LIBNAME}")
POCO_GENERATE_PACKAGE("${LIBNAME}")
if (ENABLE_TESTS)
add_subdirectory(samples)
add_subdirectory(testsuite)
endif ()
if (ENABLE_SAMPLES)
add_subdirectory(samples)
endif ()

View File

@@ -31,8 +31,11 @@ POCO_INSTALL("${LIBNAME}")
POCO_GENERATE_PACKAGE("${LIBNAME}")
if (ENABLE_TESTS)
#TODO:
# add_subdirectory(testsuite)
endif ()
if (ENABLE_SAMPLES)
#TODO: Looks like the samples use crypto somehow?
#add_subdirectory(samples)
#add_subdirectory(testsuite)
endif ()

View File

@@ -136,7 +136,9 @@ POCO_INSTALL("${LIBNAME}")
POCO_GENERATE_PACKAGE("${LIBNAME}")
if (ENABLE_TESTS)
add_subdirectory(samples)
add_subdirectory(testsuite)
endif ()
if (ENABLE_SAMPLES)
add_subdirectory(samples)
endif ()

View File

@@ -19,3 +19,7 @@ install(
RUNTIME DESTINATION bin
INCLUDES DESTINATION include
)
if (ENABLE_SAMPLES)
# add_subdirectory(samples)
endif ()

View File

@@ -31,7 +31,9 @@ POCO_INSTALL("${LIBNAME}")
POCO_GENERATE_PACKAGE("${LIBNAME}")
if (ENABLE_TESTS)
# add_subdirectory(samples)
add_subdirectory(testsuite)
endif ()
if (ENABLE_SAMPLES)
# add_subdirectory(samples)
endif ()

View File

@@ -72,8 +72,10 @@ POCO_INSTALL("${LIBNAME}")
POCO_GENERATE_PACKAGE("${LIBNAME}")
if (ENABLE_TESTS)
add_subdirectory(samples)
# TODO: Add tests
#add_subdirectory(testsuite)
endif ()
if (ENABLE_SAMPLES)
add_subdirectory(samples)
endif ()

View File

@@ -48,6 +48,8 @@ POCO_INSTALL("${LIBNAME}")
POCO_GENERATE_PACKAGE("${LIBNAME}")
if (ENABLE_TESTS)
add_subdirectory(samples)
add_subdirectory(testsuite)
endif ()
if (ENABLE_SAMPLES)
add_subdirectory(samples)
endif ()

View File

@@ -54,7 +54,9 @@ POCO_INSTALL("${LIBNAME}")
POCO_GENERATE_PACKAGE("${LIBNAME}")
if (ENABLE_TESTS)
add_subdirectory(samples)
add_subdirectory(testsuite)
endif ()
if (ENABLE_SAMPLES)
add_subdirectory(samples)
endif ()

View File

@@ -31,7 +31,9 @@ POCO_INSTALL("${LIBNAME}")
POCO_GENERATE_PACKAGE("${LIBNAME}")
if (ENABLE_TESTS)
add_subdirectory(samples)
add_subdirectory(testsuite)
endif ()
if (ENABLE_SAMPLES)
add_subdirectory(samples)
endif ()

View File

@@ -175,9 +175,8 @@ build_script:
{
mkdir cmake-build | out-null;cd cmake-build;
cmake ../. -G"NMake Makefiles JOM" -DENABLE_TESTS=ON -DENABLE_NETSSL=OFF -DENABLE_NETSSL_WIN=ON -DENABLE_DATA_MYSQL=OFF -DENABLE_REDIS=OFF;
jom
cmake --build . --config $env:configuration -- /nologo;
}
# cmake --build . --config $env:configuration -- /nologo;