]> Creatis software - crea.git/commitdiff
creaNewProject_data is now copied in share, not in bin
authorjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Sat, 23 Oct 2010 00:41:18 +0000 (00:41 +0000)
committerjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Sat, 23 Oct 2010 00:41:18 +0000 (00:41 +0000)
appli/creaNewProject/CMakeLists.txt
appli/creaNewProject/creaNewProject.cpp
appli/creaNewProject/creaNewProject.sh.in

index 3f138d5..e657693 100644 (file)
@@ -72,7 +72,7 @@ IF(WIN32)
   
 ELSE(WIN32)
 
-
+# ======================= LINUX =======================
 
   # Build tree 
   CONFIGURE_FILE(
@@ -83,7 +83,7 @@ ELSE(WIN32)
   
  # CONFIGURE_FILE(
  #   ${CMAKE_CURRENT_SOURCE_DIR}/NewProject/lib/template_lib/creaSystem.h.in
-    #${EXECUTABLE_OUTPUT_PATH}/NewProject/lib/template_lib/${PROJECT_NAME}System.h
+ #   ${EXECUTABLE_OUTPUT_PATH}/NewProject/lib/template_lib/${PROJECT_NAME}System.h
  #   ${CMAKE_CURRENT_SOURCE_DIR}/NewProject/lib/template_lib/${PROJECT_NAME}System.h
  #   @ONLY IMMEDIATE
  #   )
@@ -91,16 +91,16 @@ ELSE(WIN32)
   CREA_MKDIR(${EXECUTABLE_OUTPUT_PATH}/creaNewProject_data)
   CREA_CPDIR(${INPUT_PROJECT_DIR} ${EXECUTABLE_OUTPUT_PATH}/creaNewProject_data )
 
-
   # Install tree
   INSTALL(
     FILES ${EXECUTABLE_OUTPUT_PATH}/creaNewProject.sh
     DESTINATION bin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
     )
-  INSTALL( 
+
+  INSTALL(
     DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/creaNewProject_data
-    DESTINATION bin
+    DESTINATION share
     )  
   
 ENDIF(WIN32)
index 2861429..2eeea95 100644 (file)
@@ -11,7 +11,7 @@ IMPLEMENT_APP(myApp);
 CREA_WXMAIN_WITH_CONSOLE
 
 bool myApp::OnInit( )
-{       
+{
   wxApp::OnInit();
 #ifdef __WXGTK__
   //See http://www.wxwindows.org/faqgtk.htm#locale
index 235558e..3636167 100755 (executable)
@@ -11,7 +11,7 @@ fi
 TMP=$(which $0|rev)
 BINPATH=$(echo ${TMP#*/}|rev)
 # Input data path
-INPUT=${BINPATH}/creaNewProject_data
+INPUT=${BINPATH}/../share/creaNewProject_data
 
 OUTPUT=$1
 PROJECT=$2