diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2015-04-08 16:25:30 +0100 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2015-04-08 16:26:32 +0000 |
| commit | 5b0d5ca4a5f826dea72cca53d1fe0f4ab4eb32d7 (patch) | |
| tree | d83a097f6c0390129100595c31d6400cf1f79e56 | |
| parent | 356e9c45647071ac9f9389256dea53bbbd9c7707 (diff) | |
Fix CMake build for Windows
The change to zlib 1.28 requires the variable BUILD_SHARED_LIBS
to be set and true to build the correct zlib dll on Windows.
Change-Id: I0f46b832726834a4e99d7d7d0637112da9c0c531
Reviewed-on: https://code.wireshark.org/review/7982
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
| -rw-r--r-- | CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b446bbde1e..ab24d93524 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -497,6 +497,7 @@ if(ENABLE_STATIC) 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() |