Merge pull request #1345 from QbaseLLC/bzimmerman_CMAKE

Bzimmerman cmake

builds/cmake/Modules/FindAsciiDoc.cmake

@@ -7,17 +7,16 @@
 # A2X_FOUND - If false, don't attempt to use a2x.
 
 find_program(ASCIIDOC_EXECUTABLE asciidoc asciidoc.py
-             PATHS "$ENV{ASCIIDOC_ROOT}"
-                   "$ENV{PROGRAMW6432}/asciidoc"
-                   "$ENV{PROGRAMFILES}/asciidoc"
-                   "$ENV{PROGRAMFILES(X86)}/asciidoc")
+             PATHS ENV "ASCIIDOC_ROOT"
+                   ENV "PROGRAMW6432" PATH_SUFFIXES "/asciidoc"
+                   ENV "PROGRAMFILES" PATH_SUFFIXES "/asciidoc"
+                   ENV "PROGRAMFILES(X86)" PATH_SUFFIXES "/asciidoc")
 
 find_program(A2X_EXECUTABLE a2x
-             PATHS "$ENV{ASCIIDOC_ROOT}"
-                   "$ENV{PROGRAMW6432}/asciidoc"
-                   "$ENV{PROGRAMFILES}/asciidoc"
-                   "$ENV{PROGRAMFILES(X86)}/asciidoc")
-
+             PATHS ENV "ASCIIDOC_ROOT"
+                   ENV "PROGRAMW6432" PATH_SUFFIXES "/asciidoc"
+                   ENV "PROGRAMFILES" PATH_SUFFIXES "/asciidoc"
+                   ENV "PROGRAMFILES(X86)" PATH_SUFFIXES "/asciidoc")
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_ARGS(AsciiDoc REQUIRED_VARS ASCIIDOC_EXECUTABLE)

tests/CMakeLists.txt

@@ -61,16 +61,18 @@ if(NOT WIN32)
 endif()
 
 foreach(test ${tests})
-  add_executable(${test} ${test}.cpp)
-  target_link_libraries(${test} libzmq)
+  add_executable("${test}" "${test}.cpp")
+  target_link_libraries("${test}" libzmq)
+  set_target_properties("${test}" PROPERTIES
+    			RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
 
   if(RT_LIBRARY)
-    target_link_libraries(${test} ${RT_LIBRARY} )
+    target_link_libraries("${test}" "${RT_LIBRARY}" )
   endif()
   if(WIN32)
-    add_test(NAME ${test} WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH} COMMAND ${test})
+    add_test(NAME "${test}" WORKING_DIRECTORY "${LIBRARY_OUTPUT_PATH}" COMMAND "${test}")
   else()
-    add_test(NAME ${test} COMMAND ${test})
+    add_test(NAME "${test}" COMMAND "${test}")
   endif()
 endforeach()