Revert "Fixing booboos."

deanberris · deanberris · commit b8c28a5aed9a · 2011-12-05T18:44:33.000+11:00
This reverts commit fb05e2a.
diff --git a/libs/network/test/http/CMakeLists.txt b/libs/network/test/http/CMakeLists.txt
@@ -29,8 +29,13 @@ if (Boost_FOUND)
                 PROPERTIES COMPILE_FLAGS "-Wall")
         endif()
         add_executable(cpp-netlib-http-${test} ${test}.cpp)
+<<<<<<< HEAD
         add_dependencies(cpp-netlib-http-${test} cppnetlib-uri-parsers)
         target_link_libraries(cpp-netlib-http-${test} ${BOOST_LIBS} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri-parsers)
+=======
+        add_dependencies(cpp-netlib-http-${test} cppnetlib-uri)
+        target_link_libraries(cpp-netlib-http-${test} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri cppnetlib-client-connections)
+>>>>>>> cd5b00337224ee166982f4ce954d2d55b906d7da
         if (OPENSSL_FOUND)
             target_link_libraries(cpp-netlib-http-${test} ${OPENSSL_LIBRARIES})
         endif()
diff --git a/libs/network/test/uri/CMakeLists.txt b/libs/network/test/uri/CMakeLists.txt
@@ -6,23 +6,25 @@
 include_directories(${CPP-NETLIB_SOURCE_DIR})
 
 if (Boost_FOUND)
-  set(
-    TESTS
-    url_test
-    url_encoding_test
-    url_builder_test
-    )
-  foreach (test ${TESTS})
-    set_source_files_properties(${test}.cpp
-      PROPERTIES COMPILE_FLAGS "-Wall")
-    add_executable(cpp-netlib-${test} ${test}.cpp)
-    add_dependencies(cpp-netlib-${test} cppnetlib-uri)
-    target_link_libraries(cpp-netlib-${test} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri)
-    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})
-  endforeach (test)
-endif(Boost_FOUND)
+    set(
+        TESTS
+        url_test
+        url_http_test
+        url_mailto_test
+        )
+    foreach (test ${TESTS})
+        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)
+        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})
+    endforeach (test)
+endif()
