diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2015-10-17 12:00:27 +0200 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2015-10-17 10:40:44 +0000 |
| commit | 94fee9e78f7dcaa5c69e55c9ba823899565af339 (patch) | |
| tree | b5973cbc1587c940d98aa291cf5db69625c8134b /CMakeLists.txt | |
| parent | 47c8596efecd807d54360d3a77edab422cd2eca9 (diff) | |
Move the static handling to a place where it is effective during package
discovery.
More work needed to get static really working.
v2:
- Rebase
- Remove accidentally added macos-setup.sh changes
Change-Id: Ic3a68d2ab7064afffbf5dcfc90925699e8729780
Reviewed-on: https://code.wireshark.org/review/11082
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 06aab57ae7..ef42eb651a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -496,6 +496,16 @@ set( CPP_FLAG_TESTS ${WIRESHARK_COMMON_FLAGS} ${WIRESHARK_CPP_ONLY_FLAGS} ) include(CheckCCompilerFlag) include(CheckCXXCompilerFlag) +if(ENABLE_STATIC) + set(BUILD_SHARED_LIBS 0) + set(LINK_MODE_LIB STATIC) + set(LINK_MODE_MODULE STATIC) +else() + set(BUILD_SHARED_LIBS 1) + set(LINK_MODE_LIB SHARED) + set(LINK_MODE_MODULE MODULE) +endif() + # Sigh: Have to use THIS_FLAG instead of ${F} for some reason foreach(THIS_FLAG ${C_FLAG_TESTS}) string( REGEX REPLACE "[^a-zA-Z0-9_]+" "_" F ${THIS_FLAG} ) @@ -603,16 +613,6 @@ foreach(THIS_FLAG ${WIRESHARK_LD_FLAGS}) math(EXPR _C "${_C} + 1") endforeach() -if(ENABLE_STATIC) - set(BUILD_SHARED_LIBS 0) - set(LINK_MODE_LIB STATIC) - set(LINK_MODE_MODULE STATIC) -else() - set(BUILD_SHARED_LIBS 1) - set(LINK_MODE_LIB SHARED) - set(LINK_MODE_MODULE MODULE) -endif() - if(APPLE AND EXISTS /usr/local/opt/gettext) # GLib on OS X requires libintl. Homebrew installs gettext (and # libintl) in /usr/local/opt/gettext |