diff --git a/ApacheConnector/CMakeLists.txt b/ApacheConnector/CMakeLists.txt
index 4328c18b6..88eb2a8a9 100644
--- 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 ()
\ No newline at end of file
diff --git a/Crypto/CMakeLists.txt b/Crypto/CMakeLists.txt
index ea948be79..2f3bd41f1 100644
--- a/Crypto/CMakeLists.txt
+++ b/Crypto/CMakeLists.txt
@@ -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 ()
diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt
index ab77443cf..3d6044ab9 100644
--- 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
index 539369e2e..a583c8985 100644
--- 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
index 9f73e0376..1414d2884 100644
--- 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
index e9f443026..332438206 100644
--- 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
index e6ef2636f..f4276ced3 100644
--- 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
index b6e376a21..6688dfb4c 100644
--- 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
index 6a9b13297..6935e1c8b 100644
--- 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
index 3ecb9574a..876dd0986 100644
--- 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
index 3a55c5575..4aa148965 100644
--- 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 ()
+    
\ No newline at end of file
diff --git a/Redis/CMakeLists.txt b/Redis/CMakeLists.txt
index 191014eee..bd048482b 100644
--- 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
index fd13ee3a9..c4f3abcaa 100644
--- 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
index a367f12ea..ea442b225 100644
--- 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
index d0410781c..372465d85 100644
--- 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
index 5054baad1..0942a84d5 100644
--- 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
index 1f60730ab..eed2b4ed0 100644
--- 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;