Commit 745240ff authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Fixing problems with static linking

parent 5be6c929
...@@ -102,10 +102,15 @@ endif( ) ...@@ -102,10 +102,15 @@ endif( )
if( ITA_VISTA_BUILD_STATIC ) if( ITA_VISTA_BUILD_STATIC )
add_definitions( -DVISTABASE_STATIC -DVISTAMATH_STATIC -DVISTAASPECTS_STATIC -DVISTATOOLS_STATIC -DVISTAINTERPROCCOMM_STATIC ) add_definitions( -DVISTABASE_STATIC -DVISTAMATH_STATIC -DVISTAASPECTS_STATIC -DVISTATOOLS_STATIC -DVISTAINTERPROCCOMM_STATIC )
endif( ) endif( )
if( BUILD_SHARED_LIBS ) if( BUILD_SHARED_LIBS )
add_definitions( -DITA_CONVOLUTION_EXPORT ) add_definitions( -DITA_CONVOLUTION_EXPORT )
else( ) 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( ) endif( )
if( NOT WIN32 ) if( NOT WIN32 )
......
...@@ -12,7 +12,7 @@ if( NOT ITA_CORE_LIBS_INSTALL_WITH_DLLS ) ...@@ -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)" ) set( ITA_CORE_LIBS_INSTALL_WITH_DLLS ON CACHE BOOL "Install ita_convoi with depending DLLs (use this switch with care)" )
endif( ) 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 ) add_definitions( -DITA_BASE_STATIC -DITA_FFT_STATIC -DITA_CONVOLUTION_STATIC -DITA_DATA_SOURCES_STATIC )
endif( ) endif( )
......
...@@ -6,7 +6,7 @@ include( VistaCommon ) ...@@ -6,7 +6,7 @@ include( VistaCommon )
vista_use_package( ITAConvolution REQUIRED FIND_DEPENDENCIES ) 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 ) add_definitions( -DITA_BASE_STATIC -DITA_FFT_STATIC -DITA_CONVOLUTION_STATIC )
endif( ) endif( )
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment