Simplifying the CMakeLists files.

deanberris · deanberris · commit 01589b64c8b0 · 2011-12-05T17:09:59.000+11:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,11 @@
 
 cmake_minimum_required(VERSION 2.6)
 project(CPP-NETLIB)
-find_package( Boost 1.41.0 )
+find_package( Boost 1.43.0 REQUIRED unit_test_framework system regex date_time thread filesystem )
+find_package( OpenSSL )
+find_package( Threads )
+set(Boost_USE_STATIC_LIBS ON)
+set(Boost_USE_MULTITHREADED ON)
 set(CMAKE_VERBOSE_MAKEFILE true)
 
 if (CMAKE_BUILD_TYPE MATCHES Debug)
diff --git a/libs/network/example/CMakeLists.txt b/libs/network/example/CMakeLists.txt
@@ -4,12 +4,7 @@
 #          http://www.boost.org/LICENSE_1_0.txt)
 
 include_directories(${CPP-NETLIB_SOURCE_DIR})
-find_package( Boost 1.41.0 COMPONENTS program_options system regex date_time thread filesystem )
-find_package( OpenSSL )
 include_directories(${OPENSSL_INCLUDE_DIR})
-find_package( Threads )
-set(Boost_USE_STATIC_LIBS ON)
-set(Boost_USE_MULTITHREADED ON)
 
 if (Boost_FOUND)
     add_executable(http_client http_client.cpp)
diff --git a/libs/network/test/CMakeLists.txt b/libs/network/test/CMakeLists.txt
@@ -4,11 +4,6 @@
 #          http://www.boost.org/LICENSE_1_0.txt)
 
 include_directories(${CPP-NETLIB_SOURCE_DIR})
-find_package( Boost 1.41.0 COMPONENTS unit_test_framework system regex date_time thread filesystem )
-find_package( OpenSSL )
-find_package( Threads )
-set(Boost_USE_STATIC_LIBS ON)
-set(Boost_USE_MULTITHREADED ON)
 
 add_subdirectory(uri)
 add_subdirectory(http)
@@ -24,17 +19,17 @@ if (Boost_FOUND)
         set_source_files_properties(${test}.cpp
             PROPERTIES COMPILE_FLAGS "-Wall")
         add_executable(cpp-netlib-${test} ${test}.cpp)
-	add_dependencies(cpp-netlib-${test} cppnetlib-uri-parsers)
+        add_dependencies(cpp-netlib-${test} cppnetlib-uri-parsers)
 
-        # add_dependencies(cpp-netlib-${test} cppnetlib-uri-parsers)
-        # target_link_libraries(cpp-netlib-${test} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri-parsers)
-        target_link_libraries(cpp-netlib-${test} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri-parsers)
+        target_link_libraries(cpp-netlib-${test}
+            ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri-parsers)
         if (OPENSSL_FOUND)
             target_link_libraries(cpp-netlib-${test} ${OPENSSL_LIBRARIES})
         endif()
         set_target_properties(cpp-netlib-${test}
             PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
-        add_test(cpp-netlib-${test} ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-${test})
+        add_test(cpp-netlib-${test}
+            ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-${test})
     endforeach (test)
 
 endif()
diff --git a/libs/network/test/http/CMakeLists.txt b/libs/network/test/http/CMakeLists.txt
@@ -5,18 +5,12 @@
 # http://www.boost.org/LICENSE_1_0.txt)
 
 include_directories(${CPP-NETLIB_SOURCE_DIR})
-find_package( Boost 1.43.0 REQUIRED unit_test_framework system regex thread filesystem )
-find_package( OpenSSL )
 
 if (OPENSSL_FOUND)
     include_directories( ${OPENSSL_INCLUDE_DIR} )
     add_definitions(-DBOOST_NETWORK_ENABLE_HTTPS)
 endif()
 
-find_package( Threads )
-set(Boost_USE_STATIC_LIBS ON)
-set(Boost_USE_MULTITHREADED ON)
-
 if (Boost_FOUND)
     set ( TESTS
         client_constructor_test
