diff options
| author | Justin Ross <jross@apache.org> | 2016-05-26 21:52:56 +0000 |
|---|---|---|
| committer | Justin Ross <jross@apache.org> | 2016-05-26 21:52:56 +0000 |
| commit | f609ee876788ee9198907c3a7594e4c69a468665 (patch) | |
| tree | 21b320f48fffdc23ef7ac4c817fb060c203de17c | |
| parent | 2c36085a66c2c5b7271bced836f97a531a637ae5 (diff) | |
| download | qpid-python-f609ee876788ee9198907c3a7594e4c69a468665.tar.gz | |
QPID-7281: Relocate the find_package invocation for python; use the resulting config to run the test-time dependency check
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1745657 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | qpid/cpp/CTestCustom.cmake | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/CMakeLists.txt | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/qpid/cpp/CMakeLists.txt b/qpid/cpp/CMakeLists.txt index 12a0503398..796f587355 100644 --- a/qpid/cpp/CMakeLists.txt +++ b/qpid/cpp/CMakeLists.txt @@ -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) diff --git a/qpid/cpp/CTestCustom.cmake b/qpid/cpp/CTestCustom.cmake index 3d6bec1e33..0fcf2560b2 100644 --- a/qpid/cpp/CTestCustom.cmake +++ b/qpid/cpp/CTestCustom.cmake @@ -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") diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index be10be9b85..3b9bc472bc 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -36,7 +36,6 @@ include(CheckSizetDistinct) find_package(PkgConfig) find_package(Ruby) -find_package(PythonInterp REQUIRED) find_package(Doxygen) |