You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2016/05/26 21:52:56 UTC
svn commit: r1745657 - in /qpid/trunk/qpid/cpp: CMakeLists.txt
CTestCustom.cmake src/CMakeLists.txt
Author: jross
Date: Thu May 26 21:52:56 2016
New Revision: 1745657
URL: http://svn.apache.org/viewvc?rev=1745657&view=rev
Log:
QPID-7281: Relocate the find_package invocation for python; use the resulting config to run the test-time dependency check
Modified:
qpid/trunk/qpid/cpp/CMakeLists.txt
qpid/trunk/qpid/cpp/CTestCustom.cmake
qpid/trunk/qpid/cpp/src/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeLists.txt?rev=1745657&r1=1745656&r2=1745657&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/CMakeLists.txt Thu May 26 21:52:56 2016
@@ -49,6 +49,8 @@ set (qpidc_version ${QPID_VERSION_FULL})
include(BuildInstallSettings.cmake)
+find_package(PythonInterp REQUIRED)
+
enable_testing()
include (CTest)
configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake)
Modified: qpid/trunk/qpid/cpp/CTestCustom.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CTestCustom.cmake?rev=1745657&r1=1745656&r2=1745657&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/CTestCustom.cmake (original)
+++ qpid/trunk/qpid/cpp/CTestCustom.cmake Thu May 26 21:52:56 2016
@@ -1 +1 @@
-set(CTEST_CUSTOM_PRE_TEST "${CMAKE_BINARY_DIR}/src/tests/check_dependencies.py")
+set(CTEST_CUSTOM_PRE_TEST "${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/src/tests/check_dependencies.py")
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1745657&r1=1745656&r2=1745657&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Thu May 26 21:52:56 2016
@@ -36,7 +36,6 @@ include(CheckSizetDistinct)
find_package(PkgConfig)
find_package(Ruby)
-find_package(PythonInterp REQUIRED)
find_package(Doxygen)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org