From 7f50dfb9f5b8ce8bb51deeff7ad2d0f196269933 Mon Sep 17 00:00:00 2001
From: Dilawar Singh <dilawars@ncbs.res.in>
Date: Sat, 19 Nov 2016 17:00:04 +0530
Subject: [PATCH] This project build pymoose, gui and its examples. TODO: ctest
must check each example as well.
---
.travis.yml | 2 +-
CMakeLists.txt | 24 ++++++++++---------
...moose_core.sh.in => build_moose-core.sh.in | 0
moose-core/VERSION | 2 +-
4 files changed, 15 insertions(+), 13 deletions(-)
rename build_moose_core.sh.in => build_moose-core.sh.in (100%)
diff --git a/.travis.yml b/.travis.yml
index 372e576f..c35a904b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,4 +51,4 @@ script:
after_success:
- python -c 'import moose'
- python -c 'import moogli'
- - cd _build_moose_core && ctest --output-on-failure
+ - cd __moose-core_build && ctest --output-on-failure
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f24a534..f3b7d54d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,8 +15,8 @@ add_custom_target(moose ALL)
## intialize paths
set(PYMOOSE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/moose-core")
-set(PYMOOSE_BUILD_DIR ${CMAKE_BINARY_DIR}/__moose_core_build)
-set(PYMOOSE_INSTALL_DIR ${CMAKE_BINARY_DIR}/__moose_core_install)
+set(PYMOOSE_BUILD_DIR ${CMAKE_BINARY_DIR}/__moose-core_build)
+set(PYMOOSE_INSTALL_DIR ${CMAKE_BINARY_DIR}/__moose-core_install)
set(MOOSE_GUI_DIR ${CMAKE_SOURCE_DIR}/moose-gui)
set(MOOSE_GUI_INSTALL_DIR ${CMAKE_BINARY_DIR}/__moose-gui_install)
@@ -30,13 +30,13 @@ file(MAKE_DIRECTORY ${PYMOOSE_BUILD_DIR})
# different platform.
set(OUTPUT_MOOSEBIN ${PYMOOSE_BUILD_DIR}/moose.bin)
-configure_file( ${CMAKE_SOURCE_DIR}/build_moose_core.sh.in
- ${CMAKE_BINARY_DIR}/build_moose_core.sh )
+configure_file( ${CMAKE_SOURCE_DIR}/build_moose-core.sh.in
+ ${CMAKE_BINARY_DIR}/build_moose-core.sh )
# Build pymoose module.
add_custom_target( moose-core ALL DEPENDS ${OUTPUT_MOOSEBIN} )
add_custom_command( OUTPUT ${OUTPUT_MOOSEBIN}
- COMMAND MAKE=$(MAKE) bash -c ${CMAKE_BINARY_DIR}/build_moose_core.sh
+ COMMAND MAKE=$(MAKE) bash -c ${CMAKE_BINARY_DIR}/build_moose-core.sh
VERBATIM
)
@@ -67,14 +67,16 @@ install(DIRECTORY ${PYMOOSE_INSTALL_DIR}/
PATTERN ".git" EXCLUDE
)
-install(DIRECTORY ${MOOSE_GUI_INSTALL_DIR}
- DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/moose/gui
- PATTERN ".git" EXCLUDE
+install(DIRECTORY ${MOOSE_GUI_INSTALL_DIR}/
+ DESTINATION lib/moose/gui
+ PATTERN ".git*" EXCLUDE
)
-install(DIRECTORY ${MOOSE_EXAMPLE_DIR}
- DESTINATION ${CMAKE_INSTALL_PREFIX}
- PATTERN ".git" EXCLUDE
+install(DIRECTORY ${MOOSE_EXAMPLE_DIR}/
+ DESTINATION lib/moose/moose-examples
+ PATTERN ".git*" EXCLUDE
+ PATTERN "_travis*" EXCLUDE
+ PATTERN ".travis*" EXCLUDE
)
configure_file( ${CMAKE_SOURCE_DIR}/cmake/moose.in ${CMAKE_BINARY_DIR}/moose )
diff --git a/build_moose_core.sh.in b/build_moose-core.sh.in
similarity index 100%
rename from build_moose_core.sh.in
rename to build_moose-core.sh.in
diff --git a/moose-core/VERSION b/moose-core/VERSION
index 0eac0f04..abee1689 100644
--- a/moose-core/VERSION
+++ b/moose-core/VERSION
@@ -1 +1 @@
-3.1.1-67-g5dd1e81
\ No newline at end of file
+3.1.1-68-g407f570
\ No newline at end of file
--
GitLab