diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-02-06 16:04:57 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-02-06 16:04:57 +0100 |
| commit | 59dccf358523dfc7679d1d8c120452a71e42243c (patch) | |
| tree | f0f3cc006e8157d6bd699bd644b7dd7b35387ac2 /CMake/FindZlib.cmake | |
| parent | fd6639655b399a79fb72f494786a4f57da9c90e7 (diff) | |
| parent | d0ca838c7ab297036b4a7c45351761a48fe05efd (diff) | |
Merge branch 'feature/upstrem' into develop
Diffstat (limited to 'CMake/FindZlib.cmake')
| -rw-r--r-- | CMake/FindZlib.cmake | 43 |
1 files changed, 30 insertions, 13 deletions
diff --git a/CMake/FindZlib.cmake b/CMake/FindZlib.cmake index 3305ee3..3ad5b6c 100644 --- a/CMake/FindZlib.cmake +++ b/CMake/FindZlib.cmake @@ -10,19 +10,36 @@ #
if(WIN32)
- find_path( ZLIB_INCLUDE_DIR zlib.h
- PATHS
- $ENV{XTCEXTERNALROOT}/x86/zlib
- DOC "The directory where zip.h resides")
- find_library( ZLIB_LIBRARY
- NAMES zlib Zlib
- PATHS
- $ENV{XTCEXTERNALROOT}/x86/zlib
- DOC "The zlib library")
- find_file( ZLIB_SHAREDLIB
- NAMES zlib.dll Zlib.dll
- PATHS
- $ENV{XTCEXTERNALROOT}/x86/zlib)
+ # Folders for x86/x64
+ if (WIN64)
+ find_path( ZLIB_INCLUDE_DIR zlib.h
+ PATHS
+ $ENV{XTCEXTERNALROOT}/x64/zlib
+ DOC "The directory where zlib.h resides")
+ find_library( ZLIB_LIBRARY
+ NAMES zlib Zlib
+ PATHS
+ $ENV{XTCEXTERNALROOT}/x64/zlib
+ DOC "The zlib library")
+ find_file( ZLIB_SHAREDLIB
+ NAMES zlib.dll Zlib.dll
+ PATHS
+ $ENV{XTCEXTERNALROOT}/x64/zlib)
+ else (WIN64)
+ find_path( ZLIB_INCLUDE_DIR zlib.h
+ PATHS
+ $ENV{XTCEXTERNALROOT}/x86/zlib
+ DOC "The directory where zlib.h resides")
+ find_library( ZLIB_LIBRARY
+ NAMES zlib Zlib
+ PATHS
+ $ENV{XTCEXTERNALROOT}/x86/zlib
+ DOC "The zlib library")
+ find_file( ZLIB_SHAREDLIB
+ NAMES zlib.dll Zlib.dll
+ PATHS
+ $ENV{XTCEXTERNALROOT}/x86/zlib)
+ endif (WIN64)
else(WIN32)
find_package(PkgConfig)
pkg_check_modules(PC_ZLIB QUIET zlib)
|