From: guigues <guigues>
Date: Fri, 21 Nov 2008 14:03:22 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EED.02Oct2009~88
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f6ee0125950420d10400194d73bb9fb96f65f088;p=creaContours.git

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ced0a97..f424a75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,12 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+#MARK_AS_ADVANCED( FORCE CMAKE_BACKWARDS_COMPATIBILITY )
+
+# for CMake 2.6 corrected behaviour (see "cmake --help-policy CMP0003")
+IF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
+  CMAKE_POLICY(SET CMP0003 NEW)
+  CMAKE_POLICY(SET CMP0005 NEW)
+ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
+
 PROJECT(CreaContours)
 
 SET(PROJECT_MAJOR_VERSION 1)
diff --git a/appli/wxContourGUIExample/CMakeLists.txt b/appli/wxContourGUIExample/CMakeLists.txt
index 07cf171..b466d61 100644
--- a/appli/wxContourGUIExample/CMakeLists.txt
+++ b/appli/wxContourGUIExample/CMakeLists.txt
@@ -7,14 +7,24 @@ ELSE(WIN32)
   ADD_EXECUTABLE(wxContourGUIExample wxContourGUIExample)
 ENDIF(WIN32)
 
+
 TARGET_LINK_LIBRARIES( wxContourGUIExample
-                       creaImageIO	
+
                        Interface_Icons_NDimensions_lib
                        Interface_ManagerContour_NDimensions_lib
                        kernel_ManagerContour_NDimensions_lib
-                       CreaEnvironment
-                       maracasVisuLib
-                       vtkImaging  vtkGraphics vtkRendering vtkFiltering vtkCommon
+
+		       ${WXWIDGETS_LIBRARIES}
+		       ${VTK_LIBRARIES}
+		       ${CreaEnvironment_LIBRARIES}
+		       ${creaImageIO_LIBRARIES}
+		       ${maracasVisuLib_LIBRARIES}
+
+# HORRROOOOR !!!
+#                       creaImageIO	
+#                       CreaEnvironment
+#                       maracasVisuLib
+#                       vtkImaging  vtkGraphics vtkRendering vtkFiltering vtkCommon
                      )
 
 INSTALL_TARGETS(/bin/ wxContourGUIExample )
diff --git a/bbtk/CMakeLists.txt b/bbtk/CMakeLists.txt
index 400c6cc..4b440a4 100644
--- a/bbtk/CMakeLists.txt
+++ b/bbtk/CMakeLists.txt
@@ -4,7 +4,7 @@
 
 #===========================================================================
 # THE NAME OF THE BBTK PACKAGE
-SET(BBTK_PACKAGE_NAME CreaContour)
+SET(BBTK_PACKAGE_NAME creaContours)
 #===========================================================================
 
 
@@ -22,7 +22,7 @@ SET(${BBTK_PACKAGE_NAME}_AUTHOR "car-prie@uniandes.edu.co")
 
 #===========================================================================
 # PACKAGE DESCRIPTION
-SET(${BBTK_PACKAGE_NAME}_DESCRIPTION "This package contains the module ndimensions ")
+SET(${BBTK_PACKAGE_NAME}_DESCRIPTION "This package contains the module ndimensions. LG : what is it ? Add an example !")
 #===========================================================================
 
 #===========================================================================
diff --git a/lib/Interface_ManagerContour_NDimensions/CMakeLists.txt b/lib/Interface_ManagerContour_NDimensions/CMakeLists.txt
index 6c3c395..3e37b20 100644
--- a/lib/Interface_ManagerContour_NDimensions/CMakeLists.txt
+++ b/lib/Interface_ManagerContour_NDimensions/CMakeLists.txt
@@ -58,5 +58,6 @@ IF ( BUILD_${LIBRARY_NAME} )
   # LINK
   TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${${LIBRARY_NAME}_LINK_LIBRARIES})
 
+#MESSAGE(FATAL_ERROR "${LIBRARY_NAME}_LINK_LIBRARIES = ${${LIBRARY_NAME}_LINK_LIBRARIES}")
   #---------------------------------------------------------------------------
-ENDIF ( BUILD_${LIBRARY_NAME} )
\ No newline at end of file
+ENDIF ( BUILD_${LIBRARY_NAME} )