QPID-7281: Relocate the find_package invocation for python; use the r…

…esulting 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
kasthuriraajan · May 26, 2016 · f609ee8 · f609ee8
1 parent 2c36085
commit f609ee8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -36,7 +36,6 @@ include(CheckSizetDistinct)
 
 find_package(PkgConfig)
 find_package(Ruby)
-find_package(PythonInterp REQUIRED)
 
 find_package(Doxygen)
Original file line number	Diff line number	Diff line change
		@@ -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")