From 40f4fe3fb126ac71cbd74e5e94bd693f9e1579e3 Mon Sep 17 00:00:00 2001 From: guigues Date: Tue, 30 Sep 2008 08:41:52 +0000 Subject: [PATCH] *** empty log message *** --- CMakeLists.txt | 18 +++++++----------- src/CMakeLists.txt | 2 +- src/treelistctrl.cpp | 8 +------- src/treelistctrl.h | 3 ++- 4 files changed, 11 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 66c9894..def1eea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,28 +1,24 @@ PROJECT(creaImageIO) -SET(crea_VERBOSE_FIND_LIBRARY TRUE) +SET(PROJECT_MAJOR_VERSION 1) +SET(PROJECT_MINOR_VERSION 0) +SET(PROJECT_BUILD_VERSION 0) + +SET(CREA_VERBOSE_CMAKE TRUE) FIND_PACKAGE(crea REQUIRED) IF (crea_FOUND) INCLUDE(${crea_USE_FILE}) ENDIF(crea_FOUND) -crea_DEFINE( MY_DEFINITION ) -crea_DEFINE_WITH_VAL( MY_OTHER_DEFINITION TOTO) - - -SET(PROJECT_MAJOR_VERSION 1) -SET(PROJECT_MINOR_VERSION 0) -SET(PROJECT_BUILD_VERSION 0) - SET(USE_GDCM ON) SET(USE_GDCM_VTK ON) SET(USE_WXWIDGETS ON) SET(USE_VTK ON) +SET(USE_ITK OFF) SET(USE_BOOST ON) -SET(USE_SQLITE3 ON) -INCLUDE(${crea_CMAKE_DIR}/FindAndUseLibraries.cmake) +CREA_FIND_AND_USE_LIBRARIES() SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}) SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f9c3afb..7a0ac07 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -72,5 +72,5 @@ INSTALL( TARGETS creaImageIO DESTINATION lib) -crea_DEFAULT_INSTALL_LIBRARY_FOR_CMAKE(creaImageIO) +CREA_INSTALL_LIBRARY_FOR_CMAKE(creaImageIO) #----------------------------------------------------------------------------- diff --git a/src/treelistctrl.cpp b/src/treelistctrl.cpp index 9ed044f..205a5ca 100644 --- a/src/treelistctrl.cpp +++ b/src/treelistctrl.cpp @@ -4,7 +4,7 @@ // Author: Robert Roebling // Maintainer: Otto Wyss // Created: 01/02/97 -// RCS-ID: $Id: treelistctrl.cpp,v 1.1 2008/09/26 14:15:48 guigues Exp $ +// RCS-ID: $Id: treelistctrl.cpp,v 1.2 2008/09/30 08:41:54 guigues Exp $ // Copyright: (c) 2004 Robert Roebling, Julian Smart, Alberto Griggio, // Vadim Zeitlin, Otto Wyss // Licence: wxWindows @@ -25,12 +25,6 @@ #pragma implementation "treelistctrl.h" #endif -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif #include diff --git a/src/treelistctrl.h b/src/treelistctrl.h index 12ad46d..a5c31b8 100644 --- a/src/treelistctrl.h +++ b/src/treelistctrl.h @@ -4,7 +4,7 @@ // Author: Robert Roebling // Maintainer: Otto Wyss // Created: 01/02/97 -// RCS-ID: $Id: treelistctrl.h,v 1.1 2008/09/26 14:15:48 guigues Exp $ +// RCS-ID: $Id: treelistctrl.h,v 1.2 2008/09/30 08:41:54 guigues Exp $ // Copyright: (c) 2004 Robert Roebling, Julian Smart, Alberto Griggio, // Vadim Zeitlin, Otto Wyss // Licence: wxWindows @@ -24,6 +24,7 @@ #endif #include +#include #include #include -- 2.45.0