diff --git a/CMakeLists.txt b/CMakeLists.txt index 6968c32f41fe9b6cad0f3944aba695070c6cf49b..dbd139926dc29770e4d3a0e74484c75f3ccbf9aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,7 +126,7 @@ set(MOOSE_GUI_DIR ${CMAKE_SOURCE_DIR}/moose-gui) # Install pymoose. Use tar.gz in PYMOOSE_BUILD_DIR and unarchive it. # /usr is prefixed by bdist so we need to replace it. -install(DIRECTORY ${PYMOOSE_INSTALL_DIR}/usr/ +install(DIRECTORY ${PYMOOSE_INSTALL_DIR}/egg/ DESTINATION ${CMAKE_INSTALL_PREFIX} PATTERN ".git" EXCLUDE PATTERN "*.pyc" EXCLUDE diff --git a/moose-core/CMakeLists.txt b/moose-core/CMakeLists.txt index 03c5542d436b7cb5dfbf4c217607ab5ff78f5b10..59bd2d493b919b6d3ba23e35fcbf32b5a8b45315 100644 --- a/moose-core/CMakeLists.txt +++ b/moose-core/CMakeLists.txt @@ -460,9 +460,12 @@ if(NOT PYMOOSE_BDIST_DIR) endif( ) # get platform and arch using python. +# NOTE: creating bdist or bdist_dump uses /usr and /usr/local on rpm and deb +# based unix respectively. Not a great situation to be in. We are using +# bdist_egg and then copy everything from egg/. find_package( PythonInterp REQUIRED) add_custom_target( bdist - COMMAND ${PYTHON_EXECUTABLE} setup.cmake.py bdist -d ${PYMOOSE_BDIST_DIR} + COMMAND ${PYTHON_EXECUTABLE} setup.cmake.py bdist_egg -d ${PYMOOSE_BDIST_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/python COMMENT "Genearating bdist using setup.cmake.py." VERBATIM