Switching to default dynamic lib build mode by changing base definition...

Switching to default dynamic lib build mode by changing base definition behavior. If you do not define anything, you will end up with a shared library, now.

CMakeLists.txt

@@ -10,6 +10,10 @@ vista_use_package( ITABase REQUIRED FIND_DEPENDENCIES )
 vista_use_package( ASIO )
 vista_use_package( Portaudio )
 
+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_STREAMING_WITH_BACKEND_ASIO )
 	set( ITA_STREAMING_WITH_BACKEND_ASIO ${VASIO_FOUND} CACHE BOOL "Build with ASIO for audio streaming" )
 endif( NOT DEFINED ITA_STREAMING_WITH_BACKEND_ASIO )
@@ -67,7 +71,13 @@ endif( ITA_STREAMING_WITH_BACKEND_VIRTUAL )
 	
 
 # compiler
-add_definitions( -DITA_BASE_DLL -DITA_STREAMING_DLL -DITA_STREAMING_EXPORT )
+
+# compiler settings
+if( NOT ITA_CORE_LIBS_BUILD_STATIC )
+	add_definitions( -DITA_STREAMING_EXPORT )
+else( NOT ITA_CORE_LIBS_BUILD_STATIC )
+	add_definitions( -DITA_BASE_STATIC -ITA_STREAMING_STATIC )
+endif( NOT ITA_CORE_LIBS_BUILD_STATIC )
 
 
 # linker

include/ITAStreamingDefinitions.h

@@ -15,22 +15,18 @@
 * ----------------------------------------------------------------
 *
 */
-// $Id: ITABaseDefinitions.h 2900 2012-09-17 08:42:42Z fwefers $
 
 #ifndef INCLUDE_WATCHER_ITA_STREAMING_DEFINITIONS
 #define INCLUDE_WATCHER_ITA_STREAMING_DEFINITIONS
 
-// Import-/Export-Konventionen fr die Bibliothek definieren
-#ifdef ITA_STREAMING_DLL
-	// Dynamische Bibliothek
-	#ifdef ITA_STREAMING_EXPORT
-		#define ITA_STREAMING_API __declspec(dllexport)
-	#else
-		#define ITA_STREAMING_API __declspec(dllimport)
-	#endif
+#if ( defined WIN32 ) && !( defined ITA_STREAMING_STATIC )
+#ifdef ITA_STREAMING_EXPORT
+#define ITA_STREAMING_API __declspec( dllexport )
 #else
-	// Statische Bibliothek
-	#define ITA_STREAMING_API
+#define ITA_STREAMING_API __declspec( dllimport )
+#endif
+#else
+#define ITA_STREAMING_API
 #endif
 
 #endif // INCLUDE_WATCHER_ITA_STREAMING_DEFINITIONS

tests/CMakeLists.txt

@@ -10,7 +10,11 @@ endif()
 
 vista_use_package( ITAStreaming REQUIRED FIND_DEPENDENCIES )
 
-add_definitions( -DITA_STREAMING_DLL )
+
+if( ITA_CORE_LIBS_BUILD_STATIC AND DEFINED ITA_CORE_LIBS_BUILD_STATIC )
+	add_definitions( -DITA_STREAMING_STATIC -DITA_BASE_STATIC )
+endif( ITA_CORE_LIBS_BUILD_STATIC AND DEFINED ITA_CORE_LIBS_BUILD_STATIC  )
+
 
 add_executable( StreamingComponentTest StreamingComponentTest.cpp )
 target_link_libraries( StreamingComponentTest ${VISTA_USE_PACKAGE_LIBRARIES} )