]> Creatis software - creaContours.git/commitdiff
*** empty log message ***
authorguigues <guigues>
Fri, 21 Nov 2008 14:03:22 +0000 (14:03 +0000)
committerguigues <guigues>
Fri, 21 Nov 2008 14:03:22 +0000 (14:03 +0000)
CMakeLists.txt
appli/wxContourGUIExample/CMakeLists.txt
bbtk/CMakeLists.txt
lib/Interface_ManagerContour_NDimensions/CMakeLists.txt

index ced0a97e96152abf51239d4bc6705b5b22c48116..f424a75b1f9aac88f3acea8ade4b144862bfb615 100644 (file)
@@ -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)
index 07cf1719a1d633fe0b547bd8719eecb29da816af..b466d6146169c4bd124abd710a0c36a6bfa3b3a3 100644 (file)
@@ -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 )
index 400c6cc45227c3d2832fbb2fe8681932acf73391..4b440a4725ff1e91a403b18efd27251184afec6c 100644 (file)
@@ -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 !")
 #===========================================================================
 
 #===========================================================================
index 6c3c3955f7b6456ccd7e0177f97e12e327fd6ca6..3e37b2038892f8503da2dddf60b9d2da2ef81287 100644 (file)
@@ -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} )