Renewing cmake config v2

CMakeLists.txt

@@ -13,29 +13,21 @@ vista_use_package( ITADataSources REQUIRED FIND_DEPENDENCIES )
 vista_use_package( ITAConvolution REQUIRED FIND_DEPENDENCIES )
 vista_use_package( OpenDAFF REQUIRED )
 
-if( NOT DEFINED ITA_CORE_LIBS_BUILD_STATIC )
-	set( ITA_CORE_LIBS_BUILD_STATIC OFF CACHE BOOL "Build all ITA core libs in static mode" )
-endif( NOT DEFINED ITA_CORE_LIBS_BUILD_STATIC )
-
-if( NOT DEFINED ITA_VISTA_BUILD_STATIC )
-	set( ITA_VISTA_BUILD_STATIC OFF CACHE BOOL "Build against static ViSTA libraries" )
-endif( NOT DEFINED ITA_VISTA_BUILD_STATIC )
-
 if( NOT DEFINED ITA_CTC_WITH_DUAL_CTC )
 	set( ITA_CTC_WITH_DUAL_CTC OFF CACHE BOOL "Build support for Crosstalk-Cancellation with arbitrary loudspeaker number and pose" )
-endif( NOT DEFINED ITA_CTC_WITH_DUAL_CTC )
+endif( )
 
 if( NOT DEFINED ITA_CTC_WITH_N_CTC )
 	set( ITA_CTC_WITH_N_CTC ON CACHE BOOL "Build support for two-loudspeaker Crosstalk-Cancellation (deprecated)" )
-endif( NOT DEFINED ITA_CTC_WITH_N_CTC )
+endif( )
 
 if( NOT DEFINED ITA_CTC_WITH_QUAD_CTC )
 	set( ITA_CTC_WITH_QUAD_CTC OFF CACHE BOOL "Build support for quad-loudspeaker Crosstalk-Cancellation (deprecated)" )
-endif( NOT DEFINED ITA_CTC_WITH_QUAD_CTC )
+endif( )
 
 if( NOT DEFINED ITA_CTC_NCTC_EXPORT_FILTER_TO_HARDDRIVE )
 	set( ITA_CTC_NCTC_EXPORT_FILTER_TO_HARDDRIVE OFF CACHE BOOL "Export HRIR input,, intermediate results and final CTC filter set to harddrive (as multi-channel WAV files)" )
-endif( NOT DEFINED ITA_CTC_NCTC_EXPORT_FILTER_TO_HARDDRIVE )
+endif( )
 
 
 # includes
@@ -49,44 +41,37 @@ set( ITACTCSources )
 if( ITA_CTC_WITH_DUAL_CTC )
 	set( ITACTCHeader "${ITACTCHeader}"	"include/ITADualCTC.h" "include/ITADualCTCStreamFilter.h" )
 	set( ITACTCSources "${ITACTCSources}" "src/ITADualCTC.cpp" "src/ITADualCTCStreamFilter.cpp" )
-endif( ITA_CTC_WITH_DUAL_CTC )
+endif( )
 if( ITA_CTC_WITH_N_CTC )
 	set( ITACTCHeader "${ITACTCHeader}"	"include/ITANCTC.h" "include/ITANCTCStreamFilter.h" )
 	set( ITACTCSources "${ITACTCSources}" "src/ITANCTC.cpp" "src/ITANCTCStreamFilter.cpp" )
-endif( ITA_CTC_WITH_N_CTC )
+endif( )
 if( ITA_CTC_WITH_QUAD_CTC )
 	set( ITACTCHeader "${ITACTCHeader}"	"include/ITAQuadCTC.h" "include/ITAQuadCTCStreamFilter.h" )
 	set( ITACTCSources "${ITACTCSources}" "src/ITAQuadCTC.cpp" "src/ITAQuadCTCStreamFilter.cpp" )
-endif( ITA_CTC_WITH_QUAD_CTC )
+endif( )
 
 if( ITA_CTC_NCTC_EXPORT_FILTER_TO_HARDDRIVE )
 	add_definitions( -DNCTC_EXPORT_FILTER_TO_HARDDRIVE )
-endif( ITA_CTC_NCTC_EXPORT_FILTER_TO_HARDDRIVE )
+endif( )
 
 
 # compiler settings
 if( ITA_VISTA_BUILD_STATIC )
 	add_definitions( -DVISTABASE_STATIC -DVISTAMATH_STATIC -DVISTAASPECTS_STATIC -DVISTATOOLS_STATIC -DVISTAINTERPROCCOMM_STATIC )
-endif( ITA_VISTA_BUILD_STATIC )
+endif( )
 
-if( NOT ITA_CORE_LIBS_BUILD_STATIC )
+if( BUILD_SHARED_LIBS )
 	add_definitions( -DITA_CTC_EXPORT )
-else( NOT ITA_CORE_LIBS_BUILD_STATIC )
-	add_definitions( -DITA_FFT_STATIC -DITA_BASE_STATIC -DITA_CONVOLUTION_STATIC -DITA_CTC_STATIC )
-	set( BUILD_SHARED_LIBS_TEMP ${BUILD_SHARED_LIBS} )
-	if( BUILD_SHARED_LIBS )
-		set( BUILD_SHARED_LIBS OFF )
-		message( "Ignoring activated BUILD_SHARED_LIBS temporary because static ITA core libs requested" )
-	endif( BUILD_SHARED_LIBS )
-endif( NOT ITA_CORE_LIBS_BUILD_STATIC )
+else( )
+	add_definitions( -DITA_CTC_STATIC -DITA_CONVOLUTION_STATIC -DITA_FFT_STATIC -DITA_BASE_STATIC -DITA_DATA_SOURCES_STATIC )
+endif( )
 
 
 # linker
 add_library( ITACTC ${ITACTCHeader} ${ITACTCSources} )
 target_link_libraries( ITACTC ${VISTA_USE_PACKAGE_LIBRARIES} )
 
-set( BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_TEMP} )
-
 
 # configure
 vista_configure_lib( ITACTC )
@@ -99,5 +84,7 @@ set_property( TARGET ITACTC PROPERTY FOLDER "ITACoreLibs" )
 
 
 # tests
-set( ITACTC_COMMON_BUILD TRUE )
-add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/tests" )
+if( ITA_CORE_LIBS_WITH_TESTS )
+	set( ITACTC_COMMON_BUILD TRUE )
+	add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/tests" )
+endif( )