Fixing shared build on static demand problem by temporary switching off...

Fixing shared build on static demand problem by temporary switching off BUILD_SHARED_LIBS in CMake configuration.
parent 423d9475
......@@ -43,6 +43,12 @@ if( NOT ITA_CORE_LIBS_BUILD_STATIC )
add_definitions( -DITA_CONVOLUTION_EXPORT )
else( NOT ITA_CORE_LIBS_BUILD_STATIC )
add_definitions( -DITA_FFT_STATIC -DITA_BASE_STATIC -DITA_CONVOLUTION_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 )
set( BUILD_SHARED_LIBS OFF )
endif( NOT ITA_CORE_LIBS_BUILD_STATIC )
......@@ -50,6 +56,8 @@ endif( NOT ITA_CORE_LIBS_BUILD_STATIC )
add_library( ITAConvolution ${ITAConvolutionHeader} ${ITAConvolutionSources} )
target_link_libraries( ITAConvolution ${VISTA_USE_PACKAGE_LIBRARIES} )
set( BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_TEMP} )
# configure
vista_configure_lib( ITAConvolution )
......
......@@ -15,7 +15,6 @@
* ----------------------------------------------------------------
*
*/
// $Id: ITAConvolutionDefinitions.h 2900 2012-09-17 08:42:42Z stienen $
#ifndef INCLUDE_WATCHER_ITA_CONVOLUTION_DEFINITIONS
#define INCLUDE_WATCHER_ITA_CONVOLUTION_DEFINITIONS
......
Markdown is supported
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