qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astitc...@apache.org
Subject qpid-proton git commit: NO-JIRA: Fix CMP0026 CMake warnings and fix windows tests
Date Tue, 28 Apr 2015 14:51:42 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/master 2d899d1f5 -> a6d38181d


NO-JIRA: Fix CMP0026 CMake warnings and fix windows tests


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/a6d38181
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/a6d38181
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/a6d38181

Branch: refs/heads/master
Commit: a6d38181dba576ae65a4eeb25aa6929e43b7fd0d
Parents: 2d899d1
Author: Andrew Stitcher <astitcher@apache.org>
Authored: Tue Apr 28 01:11:23 2015 -0400
Committer: Andrew Stitcher <astitcher@apache.org>
Committed: Tue Apr 28 10:50:47 2015 -0400

----------------------------------------------------------------------
 proton-c/src/tests/CMakeLists.txt | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a6d38181/proton-c/src/tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/src/tests/CMakeLists.txt b/proton-c/src/tests/CMakeLists.txt
index efec9bd..ac749e1 100644
--- a/proton-c/src/tests/CMakeLists.txt
+++ b/proton-c/src/tests/CMakeLists.txt
@@ -29,12 +29,10 @@ macro (pn_add_c_test test file)
   target_link_libraries (${test} qpid-proton)
   pn_c_files (${file})
   if (CMAKE_SYSTEM_NAME STREQUAL Windows)
-    get_target_property(QPID_PROTON_TARGET qpid-proton LOCATION_${bld_suffix})
-    get_target_property(${test}_LOCATION ${test} LOCATION_${bld_suffix})
-    get_filename_component(QPID_PROTON_TARGET_DIR ${QPID_PROTON_TARGET} PATH)
-    add_test (${test} ${env_py}
-	          "PATH=${QPID_PROTON_TARGET_DIR}"
-	          ${${test}_LOCATION})
+    add_test (NAME ${test}
+              COMMAND ${env_py}
+                "PATH=$<TARGET_FILE_DIR:qpid-proton>"
+                $<TARGET_FILE:${test}>)
   else ()
     add_test (${test} ${memcheck-cmd} ${CMAKE_CURRENT_BINARY_DIR}/${test})
   endif ()


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message