X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FcreaNewProject%2FCMakeLists.txt;h=3e540247505a17f360dcadc27b4776f94f5e118f;hb=488c9819601126f83b399a23e1e5cbdbffa13ffa;hp=ba51ff1e711e9a1d34d816530796c9b03c343dfb;hpb=910fb9af6b1bc218d264ade77209066fc7d1e79b;p=crea.git

diff --git a/appli/creaNewProject/CMakeLists.txt b/appli/creaNewProject/CMakeLists.txt
index ba51ff1..3e54024 100644
--- a/appli/creaNewProject/CMakeLists.txt
+++ b/appli/creaNewProject/CMakeLists.txt
@@ -6,7 +6,7 @@ SET(EXE_NAME creaNewProject)
 SET(${EXE_NAME}_SOURCES creaNewProject.cpp)
 SET(${EXE_NAME}_HAS_GUI TRUE)
 SET(${EXE_NAME}_CONSOLE FALSE)
-SET(${EXE_NAME}_LINK_LIBRARIES crea )
+SET(${EXE_NAME}_LINK_LIBRARIES crea)
 
 CREA_ADD_EXECUTABLE( ${EXE_NAME} )
 #============================================================================
@@ -24,7 +24,7 @@ IF(WIN32)
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/xcopy.exe
     ${EXECUTABLE_OUTPUT_PATH}/Debug/xcopy.exe
-    @ONLY IMMEDIATE
+    COPYONLY 
     )
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/creaNewProject.bat.in
@@ -32,11 +32,11 @@ IF(WIN32)
     @ONLY IMMEDIATE
     )
          
-#  CONFIGURE_FILE(
-#    ${CMAKE_CURRENT_SOURCE_DIR}/NewProject/lib/template_lib/creaSystem.h.in
-#    ${EXECUTABLE_OUTPUT_PATH}/lib/template_lib/${PROJECT_NAME}System.h
-#    @ONLY IMMEDIATE
-#    )
+  CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/NewProject/lib/template_lib/creaSystem.h.in
+    ${EXECUTABLE_OUTPUT_PATH}/lib/template_lib/${PROJECT_NAME}System.h
+    @ONLY IMMEDIATE
+    )
       
   CREA_MKDIR(${EXECUTABLE_OUTPUT_PATH}/Debug/creaNewProject_data)
   CREA_CPDIR(${INPUT_PROJECT_DIR} ${EXECUTABLE_OUTPUT_PATH}/Debug/creaNewProject_data )
@@ -45,7 +45,7 @@ IF(WIN32)
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/xcopy.exe
     ${EXECUTABLE_OUTPUT_PATH}/Release/xcopy.exe
-    @ONLY IMMEDIATE
+    COPYONLY 
     )
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/creaNewProject.bat.in
@@ -72,7 +72,7 @@ IF(WIN32)
   
 ELSE(WIN32)
 
-
+# ======================= LINUX =======================
 
   # Build tree 
   CONFIGURE_FILE(
@@ -83,14 +83,13 @@ 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
  #   )
-    
-  CREA_MKDIR(${EXECUTABLE_OUTPUT_PATH}/creaNewProject_data)
-  CREA_CPDIR(${INPUT_PROJECT_DIR} ${EXECUTABLE_OUTPUT_PATH}/creaNewProject_data )
 
+  CREA_MKDIR(${EXECUTABLE_OUTPUT_PATH}/share/creaNewProject)
+  CREA_CPDIR(${INPUT_PROJECT_DIR} ${EXECUTABLE_OUTPUT_PATH}/share/creaNewProject)
 
   # Install tree
   INSTALL(
@@ -98,10 +97,11 @@ ELSE(WIN32)
     DESTINATION bin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
     )
-  INSTALL( 
-    DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/creaNewProject_data
-    DESTINATION bin
-    )  
+
+  INSTALL(
+    DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/share/creaNewProject
+    DESTINATION share
+    )
   
 ENDIF(WIN32)