Renewing cmake config v2

CMakeLists.txt

@@ -13,19 +13,19 @@ vista_use_package( MKL )
 
 if( NOT DEFINED ITA_FFT_WITH_FFTW3 )
 	set( ITA_FFT_WITH_FFTW3 ON CACHE BOOL "Build with FFTW3 for fast fourier transforms" )
-endif()
+endif( )
 
 if( NOT DEFINED ITA_FFT_WITH_INTEL_MKL10 )
 	set( ITA_FFT_WITH_INTEL_MKL10 OFF CACHE BOOL "Build with Intel MKL for fast fourier transforms" )
-endif()
+endif( )
 
 if( NOT DEFINED ITA_FFT_WITH_INTEL_TBB )
 	set( ITA_FFT_WITH_INTEL_TBB OFF CACHE BOOL "Build with Intel TBB for fast fourier transforms" )
-endif()
+endif( )
 
 if( NOT DEFINED ITA_FFT_WITH_FFTS )
 	set( ITA_FFT_WITH_FFTS OFF CACHE BOOL "Build with FFTS for fast fourier transforms" )
-endif()
+endif( )
 
 
 # includes
@@ -49,20 +49,24 @@ set( ITAFFTSources
 if( ITA_FFT_WITH_FFTW3 )
 	set( ITAFFTSources "${ITAFFTSources}" src/FFTW3Backend.h src/FFTW3Backend.cpp )
 	add_definitions( -DITAFFT_WITH_FFTW3 )
-endif()
+endif( )
 
 if( ITA_FFT_WITH_INTEL_MKL10 )
 	set( ITAFFTSources "${ITAFFTSources}" src/MKL10Backend.h src/MKL10Backend.cpp )
 	add_definitions( -DITAFFT_WITH_MKL10 )
-endif()
+endif( )
 	
 
 # compiler settings
-if( NOT ITA_CORE_LIBS_BUILD_STATIC )
+# compiler settings
+if( ITA_VISTA_BUILD_STATIC )
+	add_definitions( -DVISTABASE_STATIC -DVISTAMATH_STATIC -DVISTAASPECTS_STATIC -DVISTATOOLS_STATIC -DVISTAINTERPROCCOMM_STATIC )
+endif( )
+if( BUILD_SHARED_LIBS )
 	add_definitions( -DITA_FFT_EXPORT )
-else()
-	add_definitions( -DITA_FFT_STATIC )
-endif()
+else( )
+	add_definitions( -DITA_BASE_STATIC -DITA_FFT_STATIC )
+endif( )
 
 
 # linker
@@ -84,4 +88,4 @@ set_property( TARGET ITAFFT PROPERTY FOLDER "ITACoreLibs" )
 if( ITA_CORE_LIBS_WITH_TESTS )
 	set( ITAFFT_COMMON_BUILD TRUE )
 	add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/tests" )
-endif()
+endif( )