diff --git a/CMakeLists.txt b/CMakeLists.txt index e5c21fe89afd8dc2ead7b503770c9e8f1974cc26..73a52f30c35d16050fe94d1b49c390838a47f557 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,12 +31,14 @@ add_custom_command( OUTPUT ${OUTPUT_MOOSEBIN} ) find_package(PythonInterp REQUIRED) + ## moose-gui ## TODO: moose-gui should be a python module. set(MOOSE_GUI_DIR ${CMAKE_SOURCE_DIR}/moose-gui) install(DIRECTORY ${MOOSE_CORE_INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX} + PATTERN ".git" EXCLUDE ) install(DIRECTORY ${MOOSE_GUI_DIR} @@ -44,7 +46,8 @@ install(DIRECTORY ${MOOSE_GUI_DIR} PATTERN ".git" EXCLUDE ) -install(PROGRAMS ${DATA_DIR}/moosegui +configure_file( ${CMAKE_SOURCE_DIR}/cmake/moose.in ${CMAKE_BINARY_DIR}/moose ) +install(PROGRAMS ${CMAKE_BINARY_DIR}/moose DESTINATION bin ) @@ -64,3 +67,14 @@ add_custom_command(OUTPUT __uninstall_moose-gui__ ${CMAKE_INSTALL_PREFIX}/lib/moose/gui COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_INSTALL_PREFIX}/bin/moosegui ) + +################################################################################ +# CTEST +################################################################################# +enable_testing( ) +add_test( NAME test_pymoose_sanity COMMAND ${PYTHON_EXECUTABLE} -c "import moose") +add_test( NAME test_moogli_sanity COMMAND ${PYTHON_EXECUTABLE} -c "import moogli") + +set_tests_properties( test_pymoose_sanity test_moogli_sanity + PROPERTIES ENVIRONMENT "PYTHONPATH=${MOOSE_CORE_BUILD_DIR}/python" + ) diff --git a/build_moose_core.sh.in b/build_moose_core.sh.in index b0dc795a3c45151089972cf86947f385be4f2635..ca3efbedd56972af545f3921016e671b41b69894 100755 --- a/build_moose_core.sh.in +++ b/build_moose_core.sh.in @@ -15,7 +15,7 @@ echo "Building MOOSE" @CMAKE_MOOSE_CORE_ARGS@ \ @MOOSE_CORE_SOURCE_DIR@ $MAKE + ctest -V || echo "Some tests failed" $MAKE install - ctest --output-on-failure || echo "Some tests failed" ) diff --git a/moose-core/VERSION b/moose-core/VERSION index 50e47c89cafc3ec95774b3110a3dba45256d0b24..5d81ec098289586638c2a5ef92effb6b018da44c 100644 --- a/moose-core/VERSION +++ b/moose-core/VERSION @@ -1 +1 @@ -3.1.1 \ No newline at end of file +3.1.1-66-gc180075 \ No newline at end of file