From b299d0edface430f0b0ed6221987593bb123f513 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Mon, 24 Nov 2008 10:47:05 +0000 Subject: [PATCH] *** empty log message *** --- CMakeLists.txt | 3 ++- lib/maracasVisuLib/CMakeLists.txt | 4 +-- .../src/interface/wxWindows/wxMaracasMPR.h | 6 ++--- lib/maracasVisuLib/src/kernel/marDynData.h | 6 ++--- lib/maracasVisuLib/src/kernel/marObject.h | 6 ++--- lib/maracasVisuLib/src/kernel/marParameters.h | 6 ++--- lib/maracasVisuLib/src/kernel/marTypes.h | 25 +++++++++++-------- lib/maracasVisuLib/src/kernel/volume.hxx | 6 ++--- 8 files changed, 33 insertions(+), 29 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9385358..bddb6e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ IF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VER CMAKE_POLICY(SET CMP0005 NEW) ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4) -PROJECT(CreaMaracasVisu) +PROJECT(creaMaracasVisu) SET(PROJECT_MAJOR_VERSION 1) SET(PROJECT_MINOR_VERSION 0) @@ -44,3 +44,4 @@ MARK_AS_ADVANCED( #SUBDIRS(appli) SUBDIRS(lib) SUBDIRS(bbtk) +SUBDIRS(install) diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt index 2f83238..3ec066d 100644 --- a/lib/maracasVisuLib/CMakeLists.txt +++ b/lib/maracasVisuLib/CMakeLists.txt @@ -209,7 +209,7 @@ IF ( BUILD_${LIBRARY_NAME} ) CREA_MANAGE_SHARED_LIBRARY(${LIBRARY_NAME}) # CREATE THE TARGET - ADD_LIBRARY(${LIBRARY_NAME} ${${LIBRARY_NAME}_SHARED} ${${LIBRARY_NAME}_SOURCES}) + ADD_LIBRARY(${LIBRARY_NAME} ${${LIBRARY_NAME}_SHARED} ${${LIBRARY_NAME}_SOURCES} ${${LIBRARY_NAME}_HEADERS}) # LINK TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${${LIBRARY_NAME}_LINK_LIBRARIES}) @@ -271,7 +271,7 @@ INSTALL( ) INSTALL( TARGETS ${LIBRARY_NAME} - DESTINATION lib) + DESTINATION bin ) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasMPR.h b/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasMPR.h index 1f888d6..68d6f4d 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasMPR.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasMPR.h @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: wxMaracasMPR.h,v $ Language: C++ - Date: $Date: 2008/10/31 16:32:10 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/11/24 10:47:10 $ + Version: $Revision: 1.2 $ Copyright: (c) 2002, 2003 License: @@ -27,7 +27,7 @@ #include "widgets/wxMPRWidget.h" -class MAR_INTERFACEWX_EXPORT wxMaracasMPR : public wxPanel +class MARACASVISULIB_EXPORTS wxMaracasMPR : public wxPanel { public: wxMaracasMPR( wxWindow* parent, marImageData* marimagedata,double voxelSize); diff --git a/lib/maracasVisuLib/src/kernel/marDynData.h b/lib/maracasVisuLib/src/kernel/marDynData.h index 0a20e9e..9c99585 100644 --- a/lib/maracasVisuLib/src/kernel/marDynData.h +++ b/lib/maracasVisuLib/src/kernel/marDynData.h @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: marDynData.h,v $ Language: C++ - Date: $Date: 2008/10/31 16:32:55 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/11/24 10:47:12 $ + Version: $Revision: 1.2 $ Copyright: (c) 2002, 2003 License: @@ -24,7 +24,7 @@ #include -class MAR_KERNEL_EXPORT marDynData : public marObject +class MARACASVISULIB_EXPORTS marDynData : public marObject { public: diff --git a/lib/maracasVisuLib/src/kernel/marObject.h b/lib/maracasVisuLib/src/kernel/marObject.h index 2d3217c..b01c5a1 100644 --- a/lib/maracasVisuLib/src/kernel/marObject.h +++ b/lib/maracasVisuLib/src/kernel/marObject.h @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: marObject.h,v $ Language: C++ - Date: $Date: 2008/11/06 10:00:59 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/11/24 10:47:12 $ + Version: $Revision: 1.3 $ Copyright: (c) 2002, 2003 License: @@ -24,7 +24,7 @@ /** /def marObject * \brief General maracas object. */ -class MAR_KERNEL_EXPORT marObject +class MARACASVISULIB_EXPORTS marObject { public: diff --git a/lib/maracasVisuLib/src/kernel/marParameters.h b/lib/maracasVisuLib/src/kernel/marParameters.h index 369eff3..5dbf07c 100644 --- a/lib/maracasVisuLib/src/kernel/marParameters.h +++ b/lib/maracasVisuLib/src/kernel/marParameters.h @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: marParameters.h,v $ Language: C++ - Date: $Date: 2008/10/31 16:32:56 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/11/24 10:47:12 $ + Version: $Revision: 1.2 $ Copyright: (c) 2002, 2003 License: @@ -26,7 +26,7 @@ /** /def marParameters * \brief Parameters class definition. */ -class MAR_KERNEL_EXPORT marParameters +class MARACASVISULIB_EXPORTS marParameters { public: diff --git a/lib/maracasVisuLib/src/kernel/marTypes.h b/lib/maracasVisuLib/src/kernel/marTypes.h index e0e57de..887b2d7 100644 --- a/lib/maracasVisuLib/src/kernel/marTypes.h +++ b/lib/maracasVisuLib/src/kernel/marTypes.h @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: marTypes.h,v $ Language: C++ - Date: $Date: 2008/11/14 15:57:12 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/11/24 10:47:12 $ + Version: $Revision: 1.4 $ Copyright: (c) 2002, 2003 License: @@ -30,24 +30,25 @@ * this fairy tale :-). */ + //JHCL - Start //If we're using windows #if defined(WIN32) -//If we're using a dynamic library -# ifdef maracasVisuLib_BUILD_SHARED -# define MARACASVISULIB_EXPORTS __declspec( dllexport ) -# else -# define MARACASVISULIB_EXPORTS //__declspec( dllimport ) -# endif //maracasvisulib_EXPORTS + //If we're using a dynamic library + #ifdef creaMaracasVisu_BUILD_SHARED + #define MARACASVISULIB_EXPORTS __declspec( dllexport ) + #else + #define MARACASVISULIB_EXPORTS //__declspec( dllimport ) + #endif //maracasvisulib_EXPORTS #else -# define MARACASVISULIB_EXPORTS + #define MARACASVISULIB_EXPORTS #endif //JHCL - End + +/* #if defined(WIN32) //&& defined(MARACAS_BUILD_SHARED_LIBS) -//guerapa0 # ifdef MaracasKernel_EXPORTS -//querapa1 # define MAR_KERNEL_EXPORT __declspec( dllexport ) # else # define MAR_KERNEL_EXPORT //__declspec( dllimport ) @@ -65,6 +66,8 @@ # define MAR_INTERFACEWX_EXPORT #endif //WIN32 +*/ + // Other ridiculous constants and typedefs. Just for fun! #define MAR_DEFAULT_FILE_PARAMETERS "params.dat" #define MAR_DEFAULT_FILE_DICTIONARY "marDict.txt" diff --git a/lib/maracasVisuLib/src/kernel/volume.hxx b/lib/maracasVisuLib/src/kernel/volume.hxx index ed641d9..5d29892 100644 --- a/lib/maracasVisuLib/src/kernel/volume.hxx +++ b/lib/maracasVisuLib/src/kernel/volume.hxx @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: volume.hxx,v $ Language: C++ - Date: $Date: 2008/10/31 16:32:56 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/11/24 10:47:12 $ + Version: $Revision: 1.2 $ Copyright: (c) 2002, 2003 License: @@ -32,7 +32,7 @@ extern "C" #include #endif // KGFO_USE_VTK -class MAR_KERNEL_EXPORT kVolume +class MARACASVISULIB_EXPORTS kVolume { public: -- 2.45.1