Merge pull request #3246 from schulzch/cmake-fixes

CMake cleanup

unittests/CMakeLists.txt

@@ -9,17 +9,17 @@ set(unittests
   unittest_udp_address
 )
 
-#IF (ENABLE_DRAFTS)
-#    list(APPEND tests
-#    )
-#ENDIF (ENABLE_DRAFTS)
+#if(ENABLE_DRAFTS)
+#  list(APPEND tests
+#  )
+#endif(ENABLE_DRAFTS)
 
 # add location of platform.hpp for Windows builds
 if(WIN32)
-    add_definitions(-DZMQ_CUSTOM_PLATFORM_HPP)
-    add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
-    # Same name on 64bit systems
-    link_libraries(ws2_32.lib)
+  add_definitions(-DZMQ_CUSTOM_PLATFORM_HPP)
+  add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
+  # Same name on 64bit systems
+  link_libraries(ws2_32.lib)
 endif()
 
 include_directories("${ZeroMQ_SOURCE_DIR}/include" "${ZeroMQ_SOURCE_DIR}/src" "${ZeroMQ_BINARY_DIR}")
@@ -30,24 +30,24 @@ foreach(test ${unittests})
   add_executable(${test} ${test}.cpp "unittest_resolver_common.hpp")
 
   # per-test directories not generated on OS X / Darwin
-  if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang.*")
-      link_directories(${test} PRIVATE "${ZeroMQ_SOURCE_DIR}/../lib")     
+  if(NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang.*")
+    link_directories(${test} PRIVATE "${ZeroMQ_SOURCE_DIR}/../lib")
   endif()
-  
+
   target_link_libraries(${test} libzmq-static ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} unity)
-  
+
   if(RT_LIBRARY)
     target_link_libraries(${test} ${RT_LIBRARY})
   endif()
-  
+
   if(WIN32)
     add_test(NAME ${test} WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH} COMMAND ${test})
   else()
     add_test(NAME ${test} COMMAND ${test})
   endif()
-  
+
   set_tests_properties(${test} PROPERTIES TIMEOUT 10)
-  
+
   # TODO prevent libzmq (non-static) being in the list of link libraries at all
   get_target_property(LIBS ${test} LINK_LIBRARIES)
   list(REMOVE_ITEM LIBS libzmq)
@@ -61,7 +61,7 @@ file(GLOB ALL_TEST_SOURCES "test_*.cpp")
 foreach(TEST_SOURCE ${ALL_TEST_SOURCES})
   get_filename_component(TESTNAME "${TEST_SOURCE}" NAME_WE)
   string(REGEX MATCH "${TESTNAME}" MATCH_TESTNAME "${CURRENT_LIST_FILE_CONTENT}")
-  if (NOT MATCH_TESTNAME)
+  if(NOT MATCH_TESTNAME)
     message(AUTHOR_WARNING "Test '${TESTNAME}' is not known to CTest.")
   endif()
 endforeach()