From 461b3119ef9dc7871f7820d75442c171844f02ec Mon Sep 17 00:00:00 2001
From: guigues <guigues>
Date: Tue, 30 Sep 2008 10:16:53 +0000
Subject: [PATCH] *** empty log message ***

---
 appli/creaNewProject/CMakeLists.txt | 40 ++++-------------------------
 cmake/CREAMacro_mkdir.cmake         | 19 ++++++++++++++
 2 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/appli/creaNewProject/CMakeLists.txt b/appli/creaNewProject/CMakeLists.txt
index a63b05e..4682555 100644
--- a/appli/creaNewProject/CMakeLists.txt
+++ b/appli/creaNewProject/CMakeLists.txt
@@ -11,19 +11,11 @@ CREA_ADD_WX_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)
 
@@ -35,16 +27,7 @@ IF(WIN32)
     @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}/creaNewProject.bat.in
@@ -52,14 +35,7 @@ IF(WIN32)
     @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
@@ -83,15 +59,9 @@ ELSE(WIN32)
     @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)
-  
+  CREA_CPDIR(${INPUT_PROJECT_DIR} ${EXECUTABLE_OUTPUT_PATH}/creaNewProject_data )
+
+
   # Install tree
   INSTALL(
     FILES ${EXECUTABLE_OUTPUT_PATH}/creaNewProject.sh
diff --git a/cmake/CREAMacro_mkdir.cmake b/cmake/CREAMacro_mkdir.cmake
index 84e7784..7372869 100644
--- a/cmake/CREAMacro_mkdir.cmake
+++ b/cmake/CREAMacro_mkdir.cmake
@@ -8,3 +8,22 @@ MACRO(CREA_MKDIR DIR)
   ENDIF(NOT IS_DIRECTORY ${DIR})
 ENDMACRO(CREA_MKDIR)
 #========================================================================
+
+#========================================================================
+# COPIES A DIRECTORY EXCLUDING CVS ENTRIES
+MACRO(CREA_CPDIR SOURCE DEST)
+  FILE(GLOB_RECURSE NAMES RELATIVE ${SOURCE} ${SOURCE}/*)
+  FOREACH( NAME  ${NAMES})
+    STRING(SUBSTRING ${NAME} 0 3 subStrTmp )
+    IF( NOT subStrTmp STREQUAL "../" )
+      STRING(REGEX MATCH "CVS" CVSSUBS_FOUND ${NAME} )
+      IF( NOT CVSSUBS_FOUND STREQUAL "CVS" )
+	CONFIGURE_FILE(
+	  ${SOURCE}/${NAME} 
+	  ${DEST}/${NAME}
+	  COPYONLY )
+      ENDIF( NOT CVSSUBS_FOUND STREQUAL "CVS" )
+    ENDIF( NOT subStrTmp STREQUAL "../" )
+  ENDFOREACH(NAME)
+ENDMACRO(CREA_CPDIR)
+#========================================================================
-- 
2.46.1