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/FindFreeImage.cmake | |
| parent | fd6639655b399a79fb72f494786a4f57da9c90e7 (diff) | |
| parent | d0ca838c7ab297036b4a7c45351761a48fe05efd (diff) | |
Merge branch 'feature/upstrem' into develop
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
|