Renewing cmake config

CMakeLists.txt

@@ -13,25 +13,18 @@ vista_use_package( ASIO QUIET )
 vista_use_package( Portaudio QUIET )
 vista_use_package( JACK QUIET )
 
-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_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_DATA_SOURCE_WITH_INTEGRATED_ASIO )
 	set( ITA_DATA_SOURCE_WITH_INTEGRATED_ASIO ${VASIO_FOUND} CACHE BOOL "Build with ASIO support" )
-endif( NOT DEFINED ITA_DATA_SOURCE_WITH_INTEGRATED_ASIO )
+endif( )
 
 if( NOT DEFINED ITA_DATA_SOURCE_WITH_INTEGRATED_PORTAUDIO )
 	set( ITA_DATA_SOURCE_WITH_INTEGRATED_PORTAUDIO ${VPORTAUDIO_FOUND} CACHE BOOL "Build with Portaudio support" )
-endif( NOT DEFINED ITA_DATA_SOURCE_WITH_INTEGRATED_PORTAUDIO )
+endif( )
 
 if( NOT DEFINED ITA_DATA_SOURCE_WITH_INTEGRATED_JACK )
 	set( ITA_DATA_SOURCE_WITH_INTEGRATED_JACK ${VJACK_FOUND} CACHE BOOL "Build with JACK2 support" )
-endif( NOT DEFINED ITA_DATA_SOURCE_WITH_INTEGRATED_JACK )
+endif( )
 
 
 # includes
@@ -99,54 +92,46 @@ list( APPEND ITADataSourcesSources "src/ITADataSourceUtils.cpp" )
 if( WIN32 )
 	list( APPEND ITADataSourcesHeader "include/ITAStreamPump.h" "include/ITADataSourceUtils.h" )
 	list( APPEND ITADataSourcesSources "src/ITAStreamPump.cpp" "src/ITADataSourceUtils.cpp" )
-endif( WIN32 )
+endif( )
 
 if( VASIO_FOUND AND ITA_DATA_SOURCE_WITH_INTEGRATED_ASIO )
 	list( APPEND ITADataSourcesHeader "include/ITAAsioInterface.h" )
 	list( APPEND ITADataSourcesSources "src/ITAAsioInterface.cpp" )
 	add_definitions( -DIEEE754_64FLOAT=1 )
-endif( VASIO_FOUND AND ITA_DATA_SOURCE_WITH_INTEGRATED_ASIO )
+endif( )
 
 if( VPORTAUDIO_FOUND AND ITA_DATA_SOURCE_WITH_INTEGRATED_PORTAUDIO )
 	list( APPEND ITADataSourcesHeader "include/ITAPortaudioInterface.h" )
 	list( APPEND ITADataSourcesSources "src/ITAPortaudioInterface.cpp" )
-endif( VPORTAUDIO_FOUND AND ITA_DATA_SOURCE_WITH_INTEGRATED_PORTAUDIO )
+endif( )
 
 if( VJACK_FOUND AND ITA_DATA_SOURCE_WITH_INTEGRATED_JACK )
 	list( APPEND ITADataSourcesHeader "include/ITAJACKInterface.h" )
 	list( APPEND ITADataSourcesSources "src/ITAJACKInterface.cpp" )
-endif( VJACK_FOUND AND ITA_DATA_SOURCE_WITH_INTEGRATED_JACK )
+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 )
-
-if( NOT ITA_CORE_LIBS_BUILD_STATIC )
+endif( )
+if( BUILD_SHARED_LIBS )
 	add_definitions( -DITA_DATA_SOURCES_EXPORT )
-else( NOT ITA_CORE_LIBS_BUILD_STATIC )
+else( )
 	add_definitions( -DITA_BASE_STATIC -DITA_DATA_SOURCES_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 )
+endif( )
 
 
 #target_compile_features(ITADataSources PRIVATE cxx_range_for)
 if( NOT WIN32 )
 	add_definitions( -std=c++11 )
-endif( NOT WIN32)
+endif( )
 
 
 # linker
 add_library( ITADataSources ${ITADataSourcesHeader} ${ITADataSourcesSources} )
 target_link_libraries( ITADataSources ${VISTA_USE_PACKAGE_LIBRARIES} )
 
-set( BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_TEMP} )
-
 
 # config
 vista_configure_lib( ITADataSources )
@@ -159,10 +144,14 @@ set_property( TARGET ITADataSources PROPERTY FOLDER "ITACoreLibs" )
 
 	
 # apps
-set( ITADATASOURCES_COMMON_BUILD TRUE )
-add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/apps/ita_whad" )
+if( ITA_CORE_LIBS_WITH_APPS )
+	set( ITADATASOURCES_COMMON_BUILD TRUE )
+	add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/apps/ita_whad" )
+endif( )
 
 
 # tests
-set( ITADATASOURCES_COMMON_BUILD TRUE )
-add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/tests" )
+if( ITA_CORE_LIBS_WITH_TESTS )
+	set( ITADATASOURCES_COMMON_BUILD TRUE )
+	add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/tests" )
+endif( )

apps/ita_whad/CMakeLists.txt

 cmake_minimum_required( VERSION 2.8 )
 
-if( NOT ITADATASOURCES_COMMON_BUILD )
-
-	project( ita_whad )
-	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
-	include( VistaCommon )
-	
-endif()
+project( ita_whad )
+list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
+include( VistaCommon )
 
 vista_use_package( ITADataSources REQUIRED FIND_DEPENDENCIES )
 
@@ -18,9 +14,6 @@ if( ITA_DATA_SOURCE_WITH_INTEGRATED_PORTAUDIO )
 	add_definitions( "-DITA_WHAD_WITH_PORTAUDIO" )
 endif( ITA_DATA_SOURCE_WITH_INTEGRATED_PORTAUDIO )
 
-add_definitions( -DITA_DATA_SOURCES_DLL )
-
-
 add_executable( ita_whad main.cpp )
 target_link_libraries( ita_whad ${VISTA_USE_PACKAGE_LIBRARIES} )
 
@@ -29,3 +22,7 @@ vista_install( ita_whad )
 vista_create_default_info_file( ita_whad )
 
 set_property( TARGET ita_whad PROPERTY FOLDER "ITACoreLibs/Apps/ITADataSources" )
+
+if( ITA_CORE_LIBS_INSTALL_WITH_DLLS )
+	vista_install_all_dlls( bin )
+endif( )

tests/CMakeLists.txt

 cmake_minimum_required( VERSION 2.8 )
 
-if( NOT ITADATASOURCES_COMMON_BUILD )
-
-	project( ITADataSourcesTest )
-	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
-	include( VistaCommon )
-	
-endif()
+project( ITADataSourcesTest )
+list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
+include( VistaCommon )
 
 vista_use_package( ITADataSources REQUIRED FIND_DEPENDENCIES )
 
 if( ITA_CORE_LIBS_BUILD_STATIC AND DEFINED ITA_CORE_LIBS_BUILD_STATIC )
 	add_definitions( -DITA_BASE_STATIC -DITA_DATA_SOURCES_STATIC )
-endif( ITA_CORE_LIBS_BUILD_STATIC AND DEFINED ITA_CORE_LIBS_BUILD_STATIC  )
+endif( )
 
 # todo fix with if( vista_staic )!
 add_definitions( -DVISTABASE_STATIC -DVISTAMATH_STATIC -DVISTAASPECTS_STATIC -DVISTATOOLS_STATIC -DVISTAINTERPROCCOMM_STATIC )