*** empty log message ***

diff --git a/cmake/CREACMakeSettings.cmake b/cmake/CREACMakeSettings.cmake
new file mode 100644 (file)
index 0000000..42ab2c0
--- /dev/null
+++ b/cmake/CREACMakeSettings.cmake
@@ -0,0 +1,8 @@
+# MUST BE PUT BEFORE ANYTHING !!!
+#CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+
+# 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)

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index 8d7b05ea2bbe7ee580239093aa9917d5ab8823da..139c5cc29970d17e677228a866dd26774c06521e 100644 (file)
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -20,7 +20,7 @@ IF(USE_KW)
     MESSAGE ( STATUS "* Dir     = ${KWWidgets_DIR}")
     MESSAGE ( STATUS "* Version = ${KWWidgets_MAJOR_VERSION}.${KWWidgets_MINOR_VERSION}.${KWWidgets_BUILD_VERSION}")
     INCLUDE(${KWWidgets_USE_FILE})
-    ADD_DEF( USE_KWWIDGETS )
+    CREA_DEFINE( USE_KWWIDGETS )
     SET(KWWIDGETS_LIBRARIES
       ${KWWidgets_LIBRARIES}
      ) 

diff --git a/cmake/CREAMacro_FindAndUseVTK.cmake b/cmake/CREAMacro_FindAndUseVTK.cmake
index a15d0f57eaafe6d3ff4d752941b4b1f19a5a1c05..72871e095e489f43d4044c25f37ed41076caceb3 100644 (file)
--- a/cmake/CREAMacro_FindAndUseVTK.cmake
+++ b/cmake/CREAMacro_FindAndUseVTK.cmake
@@ -11,6 +11,7 @@ MACRO(CREA_FIND_AND_USE_VTK)
       MESSAGE ( STATUS "* Version = ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}")
       INCLUDE(${VTK_USE_FILE})
       CREA_DEFINE( USE_VTK )
+      CREA_DEFINE( _USE_VTK_ )
       SET(VTK_LIBRARIES
        vtkCommon     # Mandatory
        vtkFiltering  # vtkImageData

diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
index cec6770218da39a9d9d6ce0db53b90ccf24f8d4d..9a89323de1e844017774c16ba5fc5b18ad569ae2 100644 (file)
--- a/cmake/CREAMacro_FindAndUseWxWidgets.cmake
+++ b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
@@ -39,7 +39,7 @@ MACRO(CREA_FIND_WXWIDGETS)
     # aui ?
     SET(WXAUILIBS "aui")
     # LG : These options should be set by the user at top level of crea
-    FIND_PACKAGE(wxWidgets COMPONENTS base core adv 
+    FIND_PACKAGE(wxWidgets COMPONENTS base core adv html 
       ${WXAUILIBS}
       ${WXGLCANVASLIBS})
     #

diff --git a/cmake/LIBRARY_NAME_EXPORT.h.in b/cmake/LIBRARY_NAME_EXPORT.h.in
index 038f1ec8380d3a37eb811a49b6109fe87bdffab9..00c604b431510beff4b9eb05f2ba91a2dab57093 100644 (file)
--- a/cmake/LIBRARY_NAME_EXPORT.h.in
+++ b/cmake/LIBRARY_NAME_EXPORT.h.in
@@ -1,5 +1,5 @@
-#ifndef __@LIBRARY_NAME@DLLImportExport_h_INCLUDED__
-#define __@LIBRARY_NAME@DLLImportExport_h_INCLUDED__
+#ifndef __@LIBRARY_NAME@_EXPORT_h_INCLUDED__
+#define __@LIBRARY_NAME@_EXPORT_h_INCLUDED__
 
 // Automatically generated file which defines 
 // the symbols @LIBRARY_NAME@_EXPORT and @LIBRARY_NAME@_CDECL
@@ -10,7 +10,7 @@
 #if defined(_WIN32) && defined (@LIBRARY_NAME@_BUILD_SHARED)
   #ifdef @LIBRARY_NAME@_EXPORT_SYMBOLS
     #define @LIBRARY_NAME@_EXPORT __declspec( dllexport )
-#else
+  #else
     #define @LIBRARY_NAME@_EXPORT __declspec( dllimport )
   #endif
   #define @LIBRARY_NAME@_CDECL __cdecl