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 d088251f
......@@ -51,6 +51,11 @@ if( NOT ITA_CORE_LIBS_BUILD_STATIC )
add_definitions( -DITA_SAMPLER_EXPORT )
else( NOT ITA_CORE_LIBS_BUILD_STATIC )
add_definitions( -DITA_BASE_STATIC -ITA_DATA_SOURCES_STATIC -DITA_SAMPLER_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 )
......@@ -58,6 +63,8 @@ endif( NOT ITA_CORE_LIBS_BUILD_STATIC )
add_library( ITASampler ${ITASamplerHeader} ${ITASamplerSources} )
target_link_libraries( ITASampler ${VISTA_USE_PACKAGE_LIBRARIES} )
set( BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_TEMP} )
# config
vista_configure_lib( ITASampler )
......
/*
* ----------------------------------------------------------------
*
* ITA core libs
* (c) Copyright Institute of Technical Acoustics (ITA)
* RWTH Aachen University, Germany, 2015-2016
*
* ----------------------------------------------------------------
* ____ __________ _______
* // / //__ ___/ // _ |
* // / // / // /_| |
* // / // / // ___ |
* //__/ //__/ //__/ |__|
*
* ----------------------------------------------------------------
*
*/
// $Id: ITASamplerDefinitions.h 2900 2012-09-17 08:42:42Z fwefers $
* ----------------------------------------------------------------
*
* ITA core libs
* (c) Copyright Institute of Technical Acoustics (ITA)
* RWTH Aachen University, Germany, 2015-2016
*
* ----------------------------------------------------------------
* ____ __________ _______
* // / //__ ___/ // _ |
* // / // / // /_| |
* // / // / // ___ |
* //__/ //__/ //__/ |__|
*
* ----------------------------------------------------------------
*
*/
#ifndef INCLUDE_WATCHER_ITA_SAMPLER_DEFINITIONS
#define INCLUDE_WATCHER_ITA_SAMPLER_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