Split tests into samples & tests.

Signed-off-by: FrancisANDRE <[email protected]>
mean-ui-thread · Dec 19, 2015 · 6e97a9f · 6e97a9f
1 parent 1c89dc5
commit 6e97a9f
Show file tree

Hide file tree

Showing 17 changed files with 52 additions and 18 deletions.
diff --git a/ApacheConnector/CMakeLists.txt b/ApacheConnector/CMakeLists.txt
@@ -21,6 +21,6 @@ target_include_directories( "${LIBNAME}"
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
 
-if (ENABLE_TESTS)
+if (ENABLE_SAMPLES)
   add_subdirectory(samples)
 endif ()
diff --git a/Crypto/CMakeLists.txt b/Crypto/CMakeLists.txt
@@ -25,14 +25,18 @@ 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})
 
 POCO_INSTALL("${LIBNAME}")
 POCO_GENERATE_PACKAGE("${LIBNAME}")
 
 if (ENABLE_TESTS)
-    add_subdirectory(samples)
     add_subdirectory(testsuite)
 endif ()
+if (ENABLE_SAMPLES)
+    add_subdirectory(samples)
+endif ()
diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt
@@ -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 ()
diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt
@@ -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 ()
 
diff --git a/JSON/CMakeLists.txt b/JSON/CMakeLists.txt
@@ -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 ()
 
diff --git a/MongoDB/CMakeLists.txt b/MongoDB/CMakeLists.txt
@@ -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 ()
 
diff --git a/Net/CMakeLists.txt b/Net/CMakeLists.txt
@@ -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 ()
 
diff --git a/NetSSL_OpenSSL/CMakeLists.txt b/NetSSL_OpenSSL/CMakeLists.txt
@@ -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 ()
 
diff --git a/NetSSL_Win/CMakeLists.txt b/NetSSL_Win/CMakeLists.txt
@@ -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 ()
 
diff --git a/PDF/CMakeLists.txt b/PDF/CMakeLists.txt
@@ -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 ()
 
diff --git a/PageCompiler/CMakeLists.txt b/PageCompiler/CMakeLists.txt
@@ -19,3 +19,7 @@ install(
     RUNTIME DESTINATION bin
     INCLUDES DESTINATION include
     )
+if (ENABLE_SAMPLES)
+#    add_subdirectory(samples)
+endif ()
+
diff --git a/Redis/CMakeLists.txt b/Redis/CMakeLists.txt
@@ -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 ()
 
diff --git a/SevenZip/CMakeLists.txt b/SevenZip/CMakeLists.txt
@@ -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 ()
 
diff --git a/Util/CMakeLists.txt b/Util/CMakeLists.txt
@@ -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 ()
diff --git a/XML/CMakeLists.txt b/XML/CMakeLists.txt
@@ -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 ()
 
diff --git a/Zip/CMakeLists.txt b/Zip/CMakeLists.txt
@@ -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 ()
 
diff --git a/appveyor.yml b/appveyor.yml
@@ -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;