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

diff --git a/appli/creaNewProject/CMakeLists.txt b/appli/creaNewProject/CMakeLists.txt
index a63b05e..3e54024 100644
--- a/appli/creaNewProject/CMakeLists.txt
+++ b/appli/creaNewProject/CMakeLists.txt
@@ -4,65 +4,63 @@
 
 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)
 
-CREA_ADD_WX_EXECUTABLE( ${EXE_NAME} )
+CREA_ADD_EXECUTABLE( ${EXE_NAME} )
 #============================================================================
 
 
-
-
-
-
-
-
-
 #============================================================================
 # Installs creaNewProject.bat/.sh  
 # used to creates the file architecture for a new project
 # and configures/installs the empty project structure used by creaNewProject
 SET(INPUT_PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/NewProject)
-FILE(GLOB_RECURSE NAMES RELATIVE ${INPUT_PROJECT_DIR} *.txt *.in *.cmake )
 
 IF(WIN32)
 
-
   # Build tree 
+  CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/xcopy.exe
+    ${EXECUTABLE_OUTPUT_PATH}/Debug/xcopy.exe
+    COPYONLY 
+    )
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/creaNewProject.bat.in
     ${EXECUTABLE_OUTPUT_PATH}/Debug/creaNewProject.bat
     @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)
-  FOREACH( NAME  ${NAMES} )
-    STRING(SUBSTRING ${NAME} 0 3 subStrTmp )
-    MESSAGE(ERROR ${subStrTmp})
-    IF( NOT ${subStrTmp} STREQUAL "../" )
-      CONFIGURE_FILE(${INPUT_PROJECT_DIR}/${NAME} 
-	${EXECUTABLE_OUTPUT_PATH}/Debug/creaNewProject_data/${NAME}
-	COPYONLY 
-	)
-    ENDIF( NOT ${subStrTmp} STREQUAL "../" )
-  ENDFOREACH(NAME)
+  CREA_CPDIR(${INPUT_PROJECT_DIR} ${EXECUTABLE_OUTPUT_PATH}/Debug/creaNewProject_data )
   
+
+  CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/xcopy.exe
+    ${EXECUTABLE_OUTPUT_PATH}/Release/xcopy.exe
+    COPYONLY 
+    )
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/creaNewProject.bat.in
     ${EXECUTABLE_OUTPUT_PATH}/Release/creaNewProject.bat
     @ONLY IMMEDIATE
     )
   CREA_MKDIR(${EXECUTABLE_OUTPUT_PATH}/Release/creaNewProject_data)
-  FOREACH( NAME  ${NAMES})
-    STRING(SUBSTRING ${NAME} 0 3 subStrTmp )
-    IF( NOT ${subStrTmp} STREQUAL "../" )
-      CONFIGURE_FILE(${INPUT_PROJECT_DIR}/${NAME} 
-	${EXECUTABLE_OUTPUT_PATH}/Release/creaNewProject_data/${NAME}
-	COPYONLY )
-    ENDIF( NOT ${subStrTmp} STREQUAL "../" )
-  ENDFOREACH(NAME)
+  CREA_CPDIR(${INPUT_PROJECT_DIR} ${EXECUTABLE_OUTPUT_PATH}/Release/creaNewProject_data )
   
   
   # install tree
+  INSTALL(
+    PROGRAMS ${EXECUTABLE_OUTPUT_PATH}/Debug/xcopy.exe
+    DESTINATION bin
+    )
   INSTALL(
     PROGRAMS ${EXECUTABLE_OUTPUT_PATH}/Debug/creaNewProject.bat
     DESTINATION bin
@@ -74,7 +72,7 @@ IF(WIN32)
   
 ELSE(WIN32)
 
-
+# ======================= LINUX =======================
 
   # Build tree 
   CONFIGURE_FILE(
@@ -82,26 +80,28 @@ ELSE(WIN32)
     ${EXECUTABLE_OUTPUT_PATH}/creaNewProject.sh
     @ONLY IMMEDIATE
     )
-  CREA_MKDIR(${EXECUTABLE_OUTPUT_PATH}/creaNewProject_data)
-  FOREACH( NAME  ${NAMES})
-    STRING(SUBSTRING ${NAME} 0 3 subStrTmp )
-    IF( NOT ${subStrTmp} STREQUAL "../" )
-      CONFIGURE_FILE(${INPUT_PROJECT_DIR}/${NAME} 
-	${EXECUTABLE_OUTPUT_PATH}/creaNewProject_data/${NAME}
-	COPYONLY )
-    ENDIF( NOT ${subStrTmp} STREQUAL "../" )
-  ENDFOREACH(NAME)
   
+ # CONFIGURE_FILE(
+ #   ${CMAKE_CURRENT_SOURCE_DIR}/NewProject/lib/template_lib/creaSystem.h.in
+ #   ${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}/share/creaNewProject)
+  CREA_CPDIR(${INPUT_PROJECT_DIR} ${EXECUTABLE_OUTPUT_PATH}/share/creaNewProject)
+
   # 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( 
-    DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/creaNewProject_data
-    DESTINATION bin
-    )  
+
+  INSTALL(
+    DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/share/creaNewProject
+    DESTINATION share
+    )
   
 ENDIF(WIN32)