X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FcreaNewProject%2FNewProject%2FCMakeLists.txt.in;h=50c9f5dfe1a1e9e4023277d0760384bc22a5194b;hb=0dd9a222f6ab31becbec62949487350f571bdfca;hp=3190820459c1b11d8db3f77129b13c718083ead9;hpb=8b33ec17a57e0e04a97f1bbbf5e931b194be425e;p=crea.git

diff --git a/appli/creaNewProject/NewProject/CMakeLists.txt.in b/appli/creaNewProject/NewProject/CMakeLists.txt.in
index 3190820..50c9f5d 100644
--- a/appli/creaNewProject/NewProject/CMakeLists.txt.in
+++ b/appli/creaNewProject/NewProject/CMakeLists.txt.in
@@ -5,7 +5,7 @@
 # http://www.creatis.insa-lyon.fr/site/fr/CreatoosGettingStarted-v2.0.X
 # before starting.
 #
-# Generated with creaNewProject, version of : 12/03/2010
+# Generated with creaNewProject, version of : 18/03/2010
 # ---------------------------------
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
@@ -35,6 +35,9 @@ SET(PROJECT_VERSION_DATE "11/02/2010")
 #ADD_DEFINITIONS( -DPROJECT_VERSION=${PROJECT_VERSION} )
 #ADD_DEFINITIONS( -DPROJECT_VERSION_DATE=${PROJECT_VERSION_DATE} )
 
+# JPR 4 mars 2011
+set (CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Module)
+
 #==================================
 SET(CREA_VERBOSE_CMAKE TRUE)
 #==================================
@@ -45,7 +48,13 @@ IF (crea_FOUND)
 ENDIF(crea_FOUND)
 #==================================
 
-# USER! Add here as many 'FIND_PACKAGE' blocks as *your* aplication requires
+# USER! : Add here as many 'FIND_PACKAGE' blocks as *your* aplication requires
+
+# WARNING : we are talking here about 'bbtk packages', not about libraries!
+# if your project just requires the GDCM library, and not bbtk/packages/gdcm, 
+# do not add FIND_PACKAGE(gdcm REQUIRED).
+# Just set USE_GDCM to ON, after " Libraries/tools used
+
 #FIND_PACKAGE(xxx REQUIRED)
 #IF (xxx_FOUND)
 #  INCLUDE(${xxx_USE_FILE})
@@ -59,7 +68,7 @@ CREA_PREVENT_IN_SOURCE_BUILD()
 #==================================
 # Libraries/tools used
 
-# Note : Set USE_CREA to ON
+# USER! : Note : Set USE_CREA to ON
 #  if you need to LINK against crea
 #  (and not only use its macros)
 SET(USE_CREA      OFF)
@@ -69,20 +78,20 @@ SET(USE_GDCM_VTK  OFF)
 SET(USE_GDCM2     OFF)
 SET(USE_WXWIDGETS OFF)
 SET(USE_KWWIDGETS OFF)
-SET(USE_VTK       OFF)
-SET(USE_ITK       OFF)
+SET(USE_VTK       ON)
+SET(USE_ITK       ON)
 SET(USE_BOOST     OFF)
 
-# Note : Set USE_DOXYGEN to ON
+# USER! : Note : Set USE_DOXYGEN to ON
 #  if you think you will ask, some day,
 #  for Doxygen generation
-SET(USE_DOXYGEN   OFF)
+#EED SET(USE_DOXYGEN   OFF)
 
 # Note : Set USE_LATEX to ON, USE_TTH to ON
 #  if you think you will ask, some day,
 #  for doc generation using your own latex documents
-SET(USE_LATEX     OFF)
-SET(USE_TTH       OFF)
+#EED SET(USE_LATEX     OFF)
+#EED SET(USE_TTH       OFF)
 
 CREA_FIND_AND_USE_LIBRARIES()
 #==================================
@@ -96,7 +105,15 @@ MARK_AS_ADVANCED(
   EXECUTABLE_OUTPUT_PATH
   LIBRARY_OUTPUT_PATH
   )
-  
+#==================================
+
+IF(WIN32)
+  INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
+  LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
+ENDIF(WIN32)
+
+#================================== 
+
 #==================================
 
   SET(LIBNAME $(PROJECT_NAME))
@@ -105,7 +122,7 @@ MARK_AS_ADVANCED(
     ${PROJECT_BINARY_DIR}
   )
   
- # USER!   Add here the directories holding the .h you need   
+ # USER! : Add here the directories holding the .h you need   
  # INCLUDE_DIRECTORIES(appli/_YOUR_OWN_APPLI_SOURCE_DIRECTORY_)  
  # INCLUDE_DIRECTORIES(lib/_YOUR_OWN_LIBRARY_SOURCE_DIRECTORY_)  
 
@@ -117,17 +134,16 @@ INCLUDE(${PROJECT_SOURCE_DIR}/cmake/UserRootCMakeLists.cmake)
 
 #==================================
 # Where to generate documentation
-# (desperate try; JPR)
 
 SET(BBTK_DOC_BUILD_PATH 
      ${PROJECT_BINARY_DIR}/doc
    )
 #==================================
-
-# Subdirs
-SUBDIRS(lib)
-SUBDIRS(appli)
-SUBDIRS(doc)
-SUBDIRS(data)
-SUBDIRS(install)
+ # USER! : Hands off!
+# ADD_SUBDIRECTORY
+ADD_SUBDIRECTORY(lib)
+ADD_SUBDIRECTORY(appli)
+ADD_SUBDIRECTORY(doc)
+ADD_SUBDIRECTORY(data)
+ADD_SUBDIRECTORY(install)
 #==================================