Tidy up CMakeLists.txt

CMakeLists.txt

@@ -72,6 +72,7 @@ find_package(OpenSSL)
 
 if (OPENSSL_FOUND)
     add_definitions (-DBEAST_USE_OPENSSL=1)
+
 else()
     add_definitions (-DBEAST_USE_OPENSSL=0)
     message("OpenSSL not found.")
@@ -149,6 +150,10 @@ include_directories (.)
 include_directories (extras)
 include_directories (include)
 
+if (OPENSSL_FOUND)
+    include_directories (${OPENSSL_INCLUDE_DIR})
+endif()
+
 set(ZLIB_SOURCES
     ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/crc32.h
     ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/deflate.h

example/echo-op/CMakeLists.txt

@@ -1,6 +1,5 @@
 # Part of Beast
 
-GroupSources(extras/beast extras)
 GroupSources(include/beast beast)
 
 GroupSources(example/echo-op "/")

example/http-client-ssl/CMakeLists.txt

@@ -4,11 +4,12 @@ GroupSources(include/beast beast)
 
 GroupSources(example/http-client-ssl "/")
 
-include_directories(${OPENSSL_INCLUDE_DIR})
-
 add_executable (http-client-ssl
     ${BEAST_INCLUDES}
     http_client_ssl.cpp
 )
 
-target_link_libraries(http-client-ssl Beast ${OPENSSL_LIBRARIES})
+target_link_libraries(http-client-ssl
+    Beast
+    ${OPENSSL_LIBRARIES}
+    )

example/http-client/CMakeLists.txt

@@ -1,6 +1,5 @@
 # Part of Beast
 
-GroupSources(extras/beast extras)
 GroupSources(include/beast beast)
 
 GroupSources(example/http-client "/")

example/http-crawl/CMakeLists.txt

@@ -1,6 +1,5 @@
 # Part of Beast
 
-GroupSources(extras/beast extras)
 GroupSources(include/beast beast)
 
 GroupSources(example/http-crawl "/")

example/server-framework/CMakeLists.txt

@@ -4,10 +4,6 @@ GroupSources(include/beast beast)
 
 GroupSources(example/server-framework "/")
 
-if (OPENSSL_FOUND)
-  include_directories(${OPENSSL_INCLUDE_DIR})
-endif()
-
 add_executable (server-framework
     ${BEAST_INCLUDES}
     ${SERVER_INCLUDES}

example/websocket-client-ssl/CMakeLists.txt

@@ -4,11 +4,12 @@ GroupSources(include/beast beast)
 
 GroupSources(example/websocket-client-ssl "/")
 
-include_directories(${OPENSSL_INCLUDE_DIR})
-
 add_executable (websocket-client-ssl
     ${BEAST_INCLUDES}
     websocket_client_ssl.cpp
 )
 
-target_link_libraries(websocket-client-ssl Beast ${OPENSSL_LIBRARIES})
+target_link_libraries(websocket-client-ssl
+    Beast
+    ${OPENSSL_LIBRARIES}
+    )

example/websocket-client/CMakeLists.txt

@@ -1,6 +1,5 @@
 # Part of Beast
 
-GroupSources(extras/beast extras)
 GroupSources(include/beast beast)
 
 GroupSources(example/websocket-client "/")

test/CMakeLists.txt

@@ -13,6 +13,7 @@ if ((NOT "${VARIANT}" STREQUAL "coverage") AND
 
     GroupSources(extras/beast extras)
     GroupSources(include/beast beast)
+    
     GroupSources(test "/")
 
     add_executable (lib-tests

test/benchmarks/CMakeLists.txt

@@ -2,6 +2,7 @@
 
 GroupSources(extras/beast extras)
 GroupSources(include/beast beast)
+
 GroupSources(test/benchmarks "/")
 GroupSources(test/http "/")
 

test/core/CMakeLists.txt

@@ -3,6 +3,7 @@
 GroupSources(examples examples)
 GroupSources(extras/beast extras)
 GroupSources(include/beast beast)
+
 GroupSources(test/core "/")
 
 add_executable (core-tests

test/server/CMakeLists.txt

@@ -6,10 +6,6 @@ GroupSources(include/beast beast)
 
 GroupSources(test/server "/")
 
-if (OPENSSL_FOUND)
-  include_directories(${OPENSSL_INCLUDE_DIR})
-endif()
-
 add_executable (server-test
     ${BEAST_INCLUDES}
     ${SERVER_INCLUDES}

test/websocket/CMakeLists.txt

@@ -2,13 +2,10 @@
 
 GroupSources(extras/beast extras)
 GroupSources(include/beast beast)
+
 GroupSources(test/websocket "/")
 
-include_directories(../../example/)
+#include_directories(../../example/)
-
-if (OPENSSL_FOUND)
-  include_directories(${OPENSSL_INCLUDE_DIR})
-endif()
 
 add_executable (websocket-tests
     ${BEAST_INCLUDES}

test/zlib/CMakeLists.txt

@@ -2,6 +2,7 @@
 
 GroupSources(extras/beast extras)
 GroupSources(include/beast beast)
+
 GroupSources(test/zlib "/")
 
 if (MSVC)