Aufgrund von Umarbeiten des s3 Storage wird es in GitLab, in nächster Zeit, mögliche Performance-Einbußen geben. Näheres dazu unter: https://maintenance.itc.rwth-aachen.de/ticket/status/messages/43/show_ticket/6670

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 488d6780
...@@ -181,6 +181,11 @@ if( NOT ITA_CORE_LIBS_BUILD_STATIC ) ...@@ -181,6 +181,11 @@ if( NOT ITA_CORE_LIBS_BUILD_STATIC )
add_definitions( -DITA_BASE_EXPORT ) add_definitions( -DITA_BASE_EXPORT )
else( NOT ITA_CORE_LIBS_BUILD_STATIC ) else( NOT ITA_CORE_LIBS_BUILD_STATIC )
add_definitions( -DITA_BASE_STATIC ) add_definitions( -DITA_BASE_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 )
...@@ -188,6 +193,8 @@ endif( NOT ITA_CORE_LIBS_BUILD_STATIC ) ...@@ -188,6 +193,8 @@ endif( NOT ITA_CORE_LIBS_BUILD_STATIC )
add_library( ITABase ${ITABaseHeader} ${ITABaseSources} ) add_library( ITABase ${ITABaseHeader} ${ITABaseSources} )
target_link_libraries( ITABase ${VISTA_USE_PACKAGE_LIBRARIES} ) target_link_libraries( ITABase ${VISTA_USE_PACKAGE_LIBRARIES} )
set( BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_TEMP} )
# configure # configure
vista_configure_lib( ITABase ) vista_configure_lib( ITABase )
......
/* /*
* ---------------------------------------------------------------- * ----------------------------------------------------------------
* *
* ITA core libs * ITA core libs
* (c) Copyright Institute of Technical Acoustics (ITA) * (c) Copyright Institute of Technical Acoustics (ITA)
* RWTH Aachen University, Germany, 2015-2016 * RWTH Aachen University, Germany, 2015-2016
* *
* ---------------------------------------------------------------- * ----------------------------------------------------------------
* ____ __________ _______ * ____ __________ _______
* // / //__ ___/ // _ | * // / //__ ___/ // _ |
* // / // / // /_| | * // / // / // /_| |
* // / // / // ___ | * // / // / // ___ |
* //__/ //__/ //__/ |__| * //__/ //__/ //__/ |__|
* *
* ---------------------------------------------------------------- * ----------------------------------------------------------------
* *
*/ */
#ifndef INCLUDE_WATCHER_ITA_BASE_DEFINITIONS #ifndef INCLUDE_WATCHER_ITA_BASE_DEFINITIONS
#define INCLUDE_WATCHER_ITA_BASE_DEFINITIONS #define INCLUDE_WATCHER_ITA_BASE_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