From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Wed, 13 May 2009 15:07:22 +0000 (+0000)
Subject: add boost_regex to link with.
X-Git-Tag: EED.02Oct2009~27
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=910fb9af6b1bc218d264ade77209066fc7d1e79b;p=crea.git

add boost_regex to link with.
---

diff --git a/appli/creaNewProject/CMakeLists.txt b/appli/creaNewProject/CMakeLists.txt
index 31682db..ba51ff1 100644
--- a/appli/creaNewProject/CMakeLists.txt
+++ b/appli/creaNewProject/CMakeLists.txt
@@ -20,7 +20,6 @@ SET(INPUT_PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/NewProject)
 
 IF(WIN32)
 
-
   # Build tree 
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/xcopy.exe
@@ -32,6 +31,13 @@ IF(WIN32)
     ${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)
   CREA_CPDIR(${INPUT_PROJECT_DIR} ${EXECUTABLE_OUTPUT_PATH}/Debug/creaNewProject_data )
   
@@ -74,6 +80,14 @@ ELSE(WIN32)
     ${EXECUTABLE_OUTPUT_PATH}/creaNewProject.sh
     @ONLY IMMEDIATE
     )
+  
+ # 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}/creaNewProject_data)
   CREA_CPDIR(${INPUT_PROJECT_DIR} ${EXECUTABLE_OUTPUT_PATH}/creaNewProject_data )
 
diff --git a/appli/creaNewProject/NewProject/CMakeLists.txt.in b/appli/creaNewProject/NewProject/CMakeLists.txt.in
index 262312d..254ff28 100644
--- a/appli/creaNewProject/NewProject/CMakeLists.txt.in
+++ b/appli/creaNewProject/NewProject/CMakeLists.txt.in
@@ -58,6 +58,7 @@ MARK_AS_ADVANCED(
 
 #==================================
 # Subdirs
-SUBDIRS(appli)
 SUBDIRS(lib)
+SUBDIRS(appli)
+
 #==================================
diff --git a/appli/creaNewProject/NewProject/lib/template_lib/creaSystem.h b/appli/creaNewProject/NewProject/lib/template_lib/creaSystem.h
new file mode 100644
index 0000000..d91ccee
--- /dev/null
+++ b/appli/creaNewProject/NewProject/lib/template_lib/creaSystem.h
@@ -0,0 +1,26 @@
+
+#ifndef _$PROJECT_NAME$SYSTEM_H_
+#define _$PROJECT_NAME$SYSTEM_H_
+
+
+// Windoze related troubles (as usual)
+
+//-----------------------------------------------------------------------------
+
+#if defined(_WIN32)
+  #ifdef $PROJECT_NAME$_EXPORT_SYMBOLS
+    #define $PROJECT_NAME$_EXPORT __declspec( dllexport )
+#else
+    #define $PROJECT_NAME$_EXPORT __declspec( dllimport )
+  #endif
+  #define $PROJECT_NAME$_CDECL __cdecl
+#else
+  #define $PROJECT_NAME$_EXPORT
+  #define $PROJECT_NAME$_CDECL
+#endif // defined(_WIN32)
+
+#ifdef __BORLANDC__
+  #include <mem.h>
+#endif
+
+#endif
diff --git a/appli/creaNewProject/NewProject/lib/template_lib/creaSystem.h.in b/appli/creaNewProject/NewProject/lib/template_lib/creaSystem.h.in
new file mode 100644
index 0000000..d91ccee
--- /dev/null
+++ b/appli/creaNewProject/NewProject/lib/template_lib/creaSystem.h.in
@@ -0,0 +1,26 @@
+
+#ifndef _$PROJECT_NAME$SYSTEM_H_
+#define _$PROJECT_NAME$SYSTEM_H_
+
+
+// Windoze related troubles (as usual)
+
+//-----------------------------------------------------------------------------
+
+#if defined(_WIN32)
+  #ifdef $PROJECT_NAME$_EXPORT_SYMBOLS
+    #define $PROJECT_NAME$_EXPORT __declspec( dllexport )
+#else
+    #define $PROJECT_NAME$_EXPORT __declspec( dllimport )
+  #endif
+  #define $PROJECT_NAME$_CDECL __cdecl
+#else
+  #define $PROJECT_NAME$_EXPORT
+  #define $PROJECT_NAME$_CDECL
+#endif // defined(_WIN32)
+
+#ifdef __BORLANDC__
+  #include <mem.h>
+#endif
+
+#endif
diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index 07a3eaf..8a159b3 100644
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -274,6 +274,7 @@ IF(USE_BOOST)
 	    boost_filesystem
             boost_date_time
 	    boost_program_options
+	    boost_regex
 	    )
       	ELSE(NOT APPLE)
 	  SET(BOOST_LIBRARIES
@@ -282,6 +283,7 @@ IF(USE_BOOST)
 	    boost_date_time-mt
             boost_system-mt
 	    boost_program_options-mt
+	    boost_regex-mt
 	    )
       	ENDIF(NOT APPLE)
       ENDIF(NOT WIN32)