Fixing problems with static linking

745240ff · Dipl.-Ing. Jonas Stienen · 5be6c929 · 745240ff · 745240ff · 745240ff
Commit 745240ff authored Nov 28, 2017 by Dipl.-Ing. Jonas Stienen
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

CMakeLists.txt CMakeLists.txt +6 -1

apps/ita_convoi/CMakeLists.txt apps/ita_convoi/CMakeLists.txt +1 -1

tests/CMakeLists.txt tests/CMakeLists.txt +1 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,10 +102,15 @@ endif( )
 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_CONVOLUTION_EXPORT )
 else( )
-	add_definitions( -DITA_CONVOLUTION_STATIC -DITA_FFT_STATIC -DITA_BASE_STATIC -DITA_DATA_SOURCES_STATIC )
+	add_definitions( -DITA_CONVOLUTION_STATIC )
+endif( )
+
+if( ITA_CORE_LIBS_BUILD_STATIC )
+	add_definitions( -DITA_FFT_STATIC -DITA_BASE_STATIC -DITA_DATA_SOURCES_STATIC )
 endif( )

 if( NOT WIN32 )

--- a/apps/ita_convoi/CMakeLists.txt
+++ b/apps/ita_convoi/CMakeLists.txt
@@ -12,7 +12,7 @@ if( NOT ITA_CORE_LIBS_INSTALL_WITH_DLLS )
 	set( ITA_CORE_LIBS_INSTALL_WITH_DLLS ON CACHE BOOL "Install ita_convoi with depending DLLs (use this switch with care)" )	
 endif( )

-if( NOT ITA_CORE_LIBS_BUILD_STATIC )
+if( ITA_CORE_LIBS_BUILD_STATIC )
 	add_definitions( -DITA_BASE_STATIC -DITA_FFT_STATIC -DITA_CONVOLUTION_STATIC -DITA_DATA_SOURCES_STATIC )
 endif( )


--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,7 +6,7 @@ include( VistaCommon )

 vista_use_package( ITAConvolution REQUIRED FIND_DEPENDENCIES )

-if( NOT ITA_CORE_LIBS_BUILD_STATIC )
+if( ITA_CORE_LIBS_BUILD_STATIC )
 	add_definitions( -DITA_BASE_STATIC -DITA_FFT_STATIC -DITA_CONVOLUTION_STATIC )
 endif( )