Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Institute of Technical Acoustics (ITA)
ITAConvolution
Commits
745240ff
Commit
745240ff
authored
Nov 28, 2017
by
Dipl.-Ing. Jonas Stienen
Browse files
Fixing problems with static linking
parent
5be6c929
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
745240ff
...
...
@@ -102,10 +102,15 @@ endif( )
if
(
ITA_VISTA_BUILD_STATIC
)
add_definitions
(
-DVISTABASE_STATIC -DVISTAMATH_STATIC -DVISTAASPECTS_STATIC -DVISTATOOLS_STATIC -DVISTAINTERPROCCOMM_STATIC
)
endif
(
)
if
(
BUILD_SHARED_LIBS
)
add_definitions
(
-DITA_CONVOLUTION_EXPORT
)
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
(
)
if
(
NOT WIN32
)
...
...
apps/ita_convoi/CMakeLists.txt
View file @
745240ff
...
...
@@ -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)"
)
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
)
endif
(
)
...
...
tests/CMakeLists.txt
View file @
745240ff
...
...
@@ -6,7 +6,7 @@ include( VistaCommon )
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
)
endif
(
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment