From: guigues <guigues>
Date: Tue, 13 Jan 2009 09:18:15 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v0.2.0~5
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f1aae8f47492724b00ccb430a20187e1122b0d21;p=crea.git

*** empty log message ***
---

diff --git a/appli/CMakeLists.txt b/appli/CMakeLists.txt
index 74a0e60..9489edf 100644
--- a/appli/CMakeLists.txt
+++ b/appli/CMakeLists.txt
@@ -1,4 +1,4 @@
 SUBDIRS(creaNewProject)
 IF(WIN32)
-#  SUBDIRS(creaSed)
+  SUBDIRS(creaSed)
 ENDIF(WIN32)
diff --git a/appli/creaNewProject/NewProject/appli/CMakeLists.txt b/appli/creaNewProject/NewProject/appli/CMakeLists.txt
new file mode 100644
index 0000000..32618d6
--- /dev/null
+++ b/appli/creaNewProject/NewProject/appli/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Add a SUBDIRS command for each of your applications
+# SUBDIRS(myapp1)
+# SUBDIRS(myapp2)
diff --git a/appli/creaNewProject/creaNewProject.bat.in b/appli/creaNewProject/creaNewProject.bat.in
index 842dfde..c36352f 100755
--- a/appli/creaNewProject/creaNewProject.bat.in
+++ b/appli/creaNewProject/creaNewProject.bat.in
@@ -42,10 +42,10 @@ echo creaNewProject.bat "<project-path> <project-name>"
 goto END
 
 :ERROR02
-echo "ERROR : Directory '%OUTPUT%/%PROJECT%' already exists !"  
+echo "ERROR : Directory '%OUTPUT%/%PROJECT%' already exists !"
 goto end
 
 
 
 :END
-
+pause
diff --git a/appli/creaSed/CMakeLists.txt b/appli/creaSed/CMakeLists.txt
index ebe2b7d..075a4da 100644
--- a/appli/creaSed/CMakeLists.txt
+++ b/appli/creaSed/CMakeLists.txt
@@ -1,2 +1,3 @@
 SET(creaSed_SOURCES creaSed)
+SET(creaSed_HAS_GUI OFF)
 CREA_ADD_EXECUTABLE(creaSed)
diff --git a/cmake/CREAMacro_AddExecutable.cmake b/cmake/CREAMacro_AddExecutable.cmake
index 34779b0..2be0bf9 100644
--- a/cmake/CREAMacro_AddExecutable.cmake
+++ b/cmake/CREAMacro_AddExecutable.cmake
@@ -1,3 +1,11 @@
+#Generates the cmake commands to build and install the executable EXE_NAME.
+# ${EXE_NAME}_SOURCES        must contain the list of files to compile 
+#                            to build the executable.
+# ${EXE_NAME}_LINK_LIBRARIES must contain the list of libraries to link with
+#
+# On Windows:
+# if ${EXE_NAME}_HAS_GUI is set to TRUE then a Win32 application is generated
+# if ${EXE_NAME}_CONSOLE is set to TRUE then the application will have a console attached.
 MACRO(CREA_ADD_EXECUTABLE EXE_NAME)
 
   IF(CREA_VERBOSE_CMAKE)
@@ -5,14 +13,21 @@ MACRO(CREA_ADD_EXECUTABLE EXE_NAME)
     MESSAGE(STATUS "Configuring executable ${EXE_NAME}")
     MESSAGE(STATUS "   Sources  : ${${EXE_NAME}_SOURCES}")
     MESSAGE(STATUS "   Link libs: ${${EXE_NAME}_LINK_LIBRARIES}")
+    IF(WIN32)
+      MESSAGE(STATUS "   Win32 app: ${${EXE_NAME}_HAS_GUI}")
+      MESSAGE(STATUS "   Console  : ${${EXE_NAME}_CONSOLE}")
+    ENDIF(WIN32)
     MESSAGE(STATUS "===============================================")
   ENDIF(CREA_VERBOSE_CMAKE)
 
-  IF(WIN32)
-    ADD_EXECUTABLE(${EXE_NAME} WIN32 ${${EXE_NAME}_SOURCES})  
-  ELSE(WIN32)
+  IF(WIN32 AND ${EXE_NAME}_HAS_GUI )
+    ADD_EXECUTABLE(${EXE_NAME} WIN32 ${${EXE_NAME}_SOURCES})
+    IF( ${${EXE_NAME}_CONSOLE} )
+      SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES LINK_FLAGS /subsystem:console )
+    ENDIF( ${${EXE_NAME}_CONSOLE} )
+  ELSE(WIN32 AND ${EXE_NAME}_HAS_GUI )
     ADD_EXECUTABLE(${EXE_NAME} ${${EXE_NAME}_SOURCES})
-  ENDIF(WIN32)
+  ENDIF(WIN32 AND ${EXE_NAME}_HAS_GUI )
   
   TARGET_LINK_LIBRARIES(${EXE_NAME} ${${EXE_NAME}_LINK_LIBRARIES})
 
diff --git a/cmake/CREAMacro_AddWxExecutable.cmake b/cmake/CREAMacro_AddWxExecutable.cmake
deleted file mode 100644
index d7ba08b..0000000
--- a/cmake/CREAMacro_AddWxExecutable.cmake
+++ /dev/null
@@ -1,41 +0,0 @@
-#Generates the cmake commands to build and install the executable EXE_NAME.
-# ${EXE_NAME}_SOURCES        must contain the list of files to compile 
-#                            to build the executable.
-# ${EXE_NAME}_LINK_LIBRARIES must contain the list of libraries to link with
-# 
-# On Windows, if ${EXE_NAME}_CONSOLE is set to TRUE 
-# then the application will have a console attached.
-MACRO(CREA_ADD_WX_EXECUTABLE EXE_NAME)
-
-
-  IF(USE_WXWIDGETS)
-    IF(CREA_VERBOSE_CMAKE)
-      MESSAGE(STATUS "===============================================")
-      MESSAGE(STATUS "Configuring wx executable ${EXE_NAME}")
-      MESSAGE(STATUS "   Sources  : ${${EXE_NAME}_SOURCES}")
-      MESSAGE(STATUS "   Link libs: ${${EXE_NAME}_LINK_LIBRARIES}")
-      IF(WIN32)
-	MESSAGE(STATUS "   Console  : ${${EXE_NAME}_CONSOLE}")
-      ENDIF(WIN32)
-    MESSAGE(STATUS "===============================================")
-    ENDIF(CREA_VERBOSE_CMAKE)
-
-
-    IF(WIN32)
-      ADD_EXECUTABLE(${EXE_NAME} WIN32 ${${EXE_NAME}_SOURCES})  
-      IF( ${${EXE_NAME}_CONSOLE} )
-	SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES LINK_FLAGS /subsystem:console )
-      ENDIF( ${${EXE_NAME}_CONSOLE} )
-    ELSE(WIN32)
-      ADD_EXECUTABLE(${EXE_NAME} ${${EXE_NAME}_SOURCES})
-    ENDIF(WIN32)
-    
-    TARGET_LINK_LIBRARIES(${EXE_NAME} ${${EXE_NAME}_LINK_LIBRARIES})
-    INSTALL_TARGETS(/bin/ ${EXE_NAME})
-  ENDIF(USE_WXWIDGETS)
- 
-
-
-ENDMACRO(CREA_ADD_WX_EXECUTABLE)
-
-
diff --git a/cmake/CREAMacros.cmake b/cmake/CREAMacros.cmake
index 41d37c1..3428269 100644
--- a/cmake/CREAMacros.cmake
+++ b/cmake/CREAMacros.cmake
@@ -22,10 +22,6 @@ INCLUDE( ${CREA_CMAKE_DIR}/CREAMacro_AddLibrary.cmake )
 INCLUDE( ${CREA_CMAKE_DIR}/CREAMacro_AddExecutable.cmake )
 #========================================================================
 
-#========================================================================
-INCLUDE( ${CREA_CMAKE_DIR}/CREAMacro_AddWxExecutable.cmake )
-#========================================================================
-
 #========================================================================
 INCLUDE( ${CREA_CMAKE_DIR}/CREAMacro_PreventInSourceBuild.cmake )
 #========================================================================