Skip to content
Snippets Groups Projects
Commit 890be55d authored by Dilawar Singh's avatar Dilawar Singh
Browse files

bdist_egg is more consistent on both RPM and DEB based systems.

parent db4752fb
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment