From a6f10072a63ccb64e34c40da3a3571e0e9270624 Mon Sep 17 00:00:00 2001
From: Dilawar Singh <dilawars@ncbs.res.in>
Date: Wed, 5 Aug 2015 00:14:26 +0530
Subject: [PATCH] This installs and build fine.
---
CMakeLists.txt | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb5092b1..f70a3a45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ endif()
set(MOOSE_CORE_DIR "${CMAKE_SOURCE_DIR}/moose-core")
set(MOOSE_CORE_BUILD_DIR ${CMAKE_BINARY_DIR}/_build_moose_core)
set(MOOSE_CORE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
-set(PACKAGING_SCRIPTS ${CMAKE_SOURCE_DIR}/packaging_scripts)
+set(DATA_DIR ${CMAKE_SOURCE_DIR}/data)
include(ExternalProject)
message("[INFO] Installtion directory is ${CMAKE_INSTALL_PREFIX}")
@@ -21,8 +21,8 @@ ExternalProject_Add( moose-core
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/__moose-core
SOURCE_DIR ${MOOSE_CORE_DIR}
# Extremely useful in packaging
- BINARY_DIR ${MOOSE_CORE_BUILD_DIR}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${MOOSE_CORE_INSTALL_DIR}
+ #BINARY_DIR ${MOOSE_CORE_INSTALL_DIR}
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
TEST_BEFORE_INSTALL 1
BUILD_IN_SOURCE 0
)
@@ -35,7 +35,6 @@ add_custom_target(moose-gui ALL)
add_custom_command(TARGET moose-gui
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory ${MOOSE_GUI_DIR} ${MOOSE_GUI_INSTALL_DIR}
- COMMAND ${CMAKE_COMMAND} -E copy ${PACKAGING_SCRIPTS}/moosegui
- ${CMAKE_INSTALL_PREFIX}/bin
+ COMMAND ${CMAKE_COMMAND} -E copy ${DATA_DIR}/moosegui ${CMAKE_INSTALL_PREFIX}/bin/
)
--
GitLab