fix paths to test binaries

Author: matlo607

proton-c/CMakeLists.txt

@@ -640,10 +640,14 @@ if (qpid-proton-proactor)
     )
 endif()
 
+if (NOT BIN_INSTALL_DIR)
+  set(BIN_INSTALL_DIR "bin")
+endif(NOT BIN_INSTALL_DIR)
+
 # Install executables and libraries
 install(TARGETS qpid-proton qpid-proton-core ${LIB_TARGETS}
   EXPORT  proton
-  RUNTIME DESTINATION bin
+  RUNTIME DESTINATION ${BIN_INSTALL_DIR}
   ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
   LIBRARY DESTINATION ${LIB_INSTALL_DIR})
 

proton-c/bindings/cpp/CMakeLists.txt

@@ -103,10 +103,13 @@ set_target_properties (
   )
 
 ## Install
+if (NOT BIN_INSTALL_DIR)
+  set(BIN_INSTALL_DIR "bin")
+endif(NOT BIN_INSTALL_DIR)
 
 install(TARGETS qpid-proton-cpp
   EXPORT  proton-cpp
-  RUNTIME DESTINATION bin
+  RUNTIME DESTINATION ${BIN_INSTALL_DIR}
   ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
   LIBRARY DESTINATION ${LIB_INSTALL_DIR})
 
@@ -132,11 +135,11 @@ install (FILES
   DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 if (DEFINED CMAKE_IMPORT_LIBRARY_PREFIX)
-set(PROTONCPPLIB ${CMAKE_IMPORT_LIBRARY_PREFIX}qpid-proton-cpp${CMAKE_IMPORT_LIBRARY_SUFFIX})
-set(PROTONCPPLIBDEBUG ${CMAKE_IMPORT_LIBRARY_PREFIX}qpid-proton-cpp${CMAKE_DEBUG_POSTFIX}${CMAKE_IMPORT_LIBRARY_SUFFIX})
+  set(PROTONCPPLIB ${CMAKE_IMPORT_LIBRARY_PREFIX}qpid-proton-cpp${CMAKE_IMPORT_LIBRARY_SUFFIX})
+  set(PROTONCPPLIBDEBUG ${CMAKE_IMPORT_LIBRARY_PREFIX}qpid-proton-cpp${CMAKE_DEBUG_POSTFIX}${CMAKE_IMPORT_LIBRARY_SUFFIX})
 else ()
-set(PROTONCPPLIB ${CMAKE_SHARED_LIBRARY_PREFIX}qpid-proton-cpp${CMAKE_SHARED_LIBRARY_SUFFIX})
-set(PROTONCPPLIBDEBUG ${CMAKE_SHARED_LIBRARY_PREFIX}qpid-proton-cpp${CMAKE_DEBUG_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
+  set(PROTONCPPLIB ${CMAKE_SHARED_LIBRARY_PREFIX}qpid-proton-cpp${CMAKE_SHARED_LIBRARY_SUFFIX})
+  set(PROTONCPPLIBDEBUG ${CMAKE_SHARED_LIBRARY_PREFIX}qpid-proton-cpp${CMAKE_DEBUG_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
 endif ()
 
 include(WriteBasicConfigVersionFile)
@@ -167,7 +170,7 @@ macro(add_cpp_test test)
       "PATH=$<TARGET_FILE_DIR:qpid-proton>"
       $<TARGET_FILE:${test}> ${ARGN})
   else ()
-    add_test (NAME cpp-${test} COMMAND ${memcheck-cmd} ${CMAKE_CURRENT_BINARY_DIR}/${test} ${ARGN})
+    add_test (NAME cpp-${test} COMMAND ${memcheck-cmd} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${test} ${ARGN})
   endif ()
 endmacro(add_cpp_test)
 

proton-c/src/tests/CMakeLists.txt

@@ -40,7 +40,7 @@ macro (pn_add_c_test test)
                 "PATH=$<TARGET_FILE_DIR:qpid-proton>"
                 $<TARGET_FILE:${test}>)
   else ()
-    add_test (${test} ${memcheck-cmd} ${CMAKE_CURRENT_BINARY_DIR}/${test})
+    add_test (${test} ${memcheck-cmd} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${test})
   endif ()
 endmacro(pn_add_c_test)