diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-02-06 16:04:24 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-02-06 16:04:24 +0100 |
| commit | 5d2c2b27a6323e2666378b986129b2a7c2c39e5c (patch) | |
| tree | ce8982b6c0111f79791068de2c2d4c6ce3138a49 /CMake/FindFreeImage.cmake | |
| parent | b623f5953691b2a0614e6f1f4def86bdbb9a4113 (diff) | |
New upstream version 5.2.2GAupstream/5.2.2GA
Diffstat (limited to 'CMake/FindFreeImage.cmake')
| -rw-r--r-- | CMake/FindFreeImage.cmake | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/CMake/FindFreeImage.cmake b/CMake/FindFreeImage.cmake index 6073916..b24f98d 100644 --- a/CMake/FindFreeImage.cmake +++ b/CMake/FindFreeImage.cmake @@ -12,20 +12,38 @@ #
if (WIN32)
+ # Folders for x86/x64
+ if (WIN64)
find_path( FREEIMAGE_INCLUDE_PATH FreeImage.h
PATHS
- $ENV{XTCEXTERNALROOT}/x86/FreeImage
+ $ENV{XTCEXTERNALROOT}/x64/FreeImage
DOC "The directory where FreeImage.h resides")
find_library( FREEIMAGE_LIBRARY
NAMES FreeImage freeimage
PATHS
- $ENV{XTCEXTERNALROOT}/x86/FreeImage
+ $ENV{XTCEXTERNALROOT}/x64/FreeImage
DOC "The FreeImage library")
find_file( FREEIMAGE_SHAREDLIB
NAMES freeimage.DLL
PATHS
- $ENV{XTCEXTERNALROOT}/x86/FreeImage
+ $ENV{XTCEXTERNALROOT}/x64/FreeImage
)
+ else (WIN64)
+ find_path( FREEIMAGE_INCLUDE_PATH FreeImage.h
+ PATHS
+ $ENV{XTCEXTERNALROOT}/x86/FreeImage
+ DOC "The directory where FreeImage.h resides")
+ find_library( FREEIMAGE_LIBRARY
+ NAMES FreeImage freeimage
+ PATHS
+ $ENV{XTCEXTERNALROOT}/x86/FreeImage
+ DOC "The FreeImage library")
+ find_file( FREEIMAGE_SHAREDLIB
+ NAMES freeimage.DLL
+ PATHS
+ $ENV{XTCEXTERNALROOT}/x86/FreeImage
+ )
+ endif (WIN64)
else (WIN32)
find_path( FREEIMAGE_INCLUDE_PATH FreeImage.h
/usr/include
|