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 d35f5669
...@@ -57,6 +57,11 @@ if( NOT ITA_CORE_LIBS_BUILD_STATIC ) ...@@ -57,6 +57,11 @@ if( NOT ITA_CORE_LIBS_BUILD_STATIC )
add_definitions( -DITA_DIFFRACTION_EXPORT ) add_definitions( -DITA_DIFFRACTION_EXPORT )
else( NOT ITA_CORE_LIBS_BUILD_STATIC ) else( NOT ITA_CORE_LIBS_BUILD_STATIC )
add_definitions( -DITA_BASE_STATIC -ITA_GEO_STATIC -DITA_DIFFRACTION_STATIC ) add_definitions( -DITA_BASE_STATIC -ITA_GEO_STATIC -DITA_DIFFRACTION_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( NOT ITA_CORE_LIBS_BUILD_STATIC )
...@@ -64,6 +69,8 @@ endif( NOT ITA_CORE_LIBS_BUILD_STATIC ) ...@@ -64,6 +69,8 @@ endif( NOT ITA_CORE_LIBS_BUILD_STATIC )
add_library( ITADiffraction ${ITADiffractionHeader} ${ITADiffractionSources} ) add_library( ITADiffraction ${ITADiffractionHeader} ${ITADiffractionSources} )
target_link_libraries( ITADiffraction ${VISTA_USE_PACKAGE_LIBRARIES} ) target_link_libraries( ITADiffraction ${VISTA_USE_PACKAGE_LIBRARIES} )
set( BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_TEMP} )
# config # config
vista_configure_lib( ITADiffraction ) vista_configure_lib( ITADiffraction )
......
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