qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astitc...@apache.org
Subject svn commit: r1560851 - /qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
Date Thu, 23 Jan 2014 23:34:14 GMT
Author: astitcher
Date: Thu Jan 23 23:34:14 2014
New Revision: 1560851

URL: http://svn.apache.org/r1560851
Log:
NO-JIRA: Changes to python related build processes:
- Use an intermediate build area in the build area not in the source.
-- With this change the source tree is now completely untouched during
   a build.
- Fiddle with CMake so that the python install into the build area doesn't
  happen on every build.

Modified:
    qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt

Modified: qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt?rev=1560851&r1=1560850&r2=1560851&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt Thu Jan 23 23:34:14 2014
@@ -304,12 +304,24 @@ if (BUILD_SASL)
     remember_location(sasl_version)
 endif (BUILD_SASL)
 
-# Always run the python install, setup.py is smart enough to do only what is needed.
 set (python_bld ${CMAKE_CURRENT_BINARY_DIR}/python)
 set (python_src ${CMAKE_SOURCE_DIR}/../python)
-add_custom_target(python_bld ALL
-  COMMAND ${PYTHON_EXECUTABLE} setup.py install --prefix=${python_bld} --install-lib=${python_bld}
--install-scripts=${python_bld}/commands
-  WORKING_DIRECTORY ${python_src})
+
+# If we want this to automatically run when we change the python library we will need to
+# add some explicit dependencies on the source python files
+add_custom_command(
+    OUTPUT ${python_bld}
+    COMMAND ${PYTHON_EXECUTABLE}
+        setup.py
+        build --build-base=${python_bld}/build
+        install --prefix=${python_bld} --install-lib=${python_bld} --install-scripts=${python_bld}/commands
+    WORKING_DIRECTORY ${python_src}
+)
+
+add_custom_target(
+    python_bld ALL
+    DEPENDS ${python_bld}
+)
 
 if (BUILD_SASL)
     add_test (sasl_fed ${test_wrap} -- ${CMAKE_CURRENT_SOURCE_DIR}/sasl_fed${test_script_suffix})



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


Mime
View raw message