diff --git a/.travis.yml b/.travis.yml index 047a95a5ac9147cef708937b6ed3b676e8f4b040..1a6d6efdb4424b0f968eec02155ea2adb15f7178 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,4 @@ sudo : required -dist : trusty -group : edge compiler: - gcc diff --git a/debian/rules b/debian/rules index 823c7f6375066cc886e81167d0a70b3c83f36db0..b9f79dc0cd7a928b5f2ac09e7e1742a20df7bc4d 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ override_dh_auto_clean: # consider using -DUSE_VERSIONED_DIR=ON if backporting override_dh_auto_configure: - cmake -DCMAKE_INSTALL_PREFIX=debian/tmp/usr + cmake -DCMAKE_INSTALL_PREFIX=debian/tmp/usr -DCMAKE_VERSION=3.2.git override_dh_auto_build: make VERBOSE=0 -j`nproc` diff --git a/moose-core/CMakeLists.txt b/moose-core/CMakeLists.txt index 59bd2d493b919b6d3ba23e35fcbf32b5a8b45315..6b40a8edbda9f45fb7673369f9adfa857975d20e 100644 --- a/moose-core/CMakeLists.txt +++ b/moose-core/CMakeLists.txt @@ -461,11 +461,12 @@ 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/. +# based unix respectively. Not a great situation to be in. Need to write a +# setup.cfg file to fix the prefix in all cases. +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/python/setup.cfg "[install]\nprefix=/usr" ) find_package( PythonInterp REQUIRED) add_custom_target( bdist - COMMAND ${PYTHON_EXECUTABLE} setup.cmake.py bdist_egg -d ${PYMOOSE_BDIST_DIR} + COMMAND ${PYTHON_EXECUTABLE} setup.cmake.py bdist_dumb -d ${PYMOOSE_BDIST_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/python COMMENT "Genearating bdist using setup.cmake.py." VERBATIM diff --git a/moose-core/python/setup.cmake.py b/moose-core/python/setup.cmake.py index 22da886d01bf295f75e044920edfebd1bcb410b6..b1761f9957ee37b274fc3fbc6cd50b833356a107 100644 --- a/moose-core/python/setup.cmake.py +++ b/moose-core/python/setup.cmake.py @@ -25,6 +25,7 @@ try: except Exception as e: from distutils.core import setup + # Read version from VERSION created by cmake file. This file must be present for # setup.cmake.py to work perfectly. script_dir = os.path.dirname( os.path.abspath( __file__ ) )