Skip to content

Commit 05db058

Browse files
author
Joel
committed
Add ${SDL2_PATH}
FindSDL2_image.cmake would not work for me on windows using mingw/Clion unless I included SDL2_PATH again.
1 parent 86c84e7 commit 05db058

File tree

1 file changed

+32
-30
lines changed

1 file changed

+32
-30
lines changed

FindSDL2_image.cmake

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -43,42 +43,44 @@
4343
# License text for the above reference.)
4444

4545
find_path(SDL2_IMAGE_INCLUDE_DIR SDL_image.h
46-
HINTS
47-
ENV SDL2IMAGEDIR
48-
ENV SDL2DIR
49-
PATH_SUFFIXES SDL2
50-
# path suffixes to search inside ENV{SDLDIR}
51-
include/SDL2 include
52-
)
46+
HINTS
47+
ENV SDL2IMAGEDIR
48+
ENV SDL2DIR
49+
PATH_SUFFIXES SDL2
50+
# path suffixes to search inside ENV{SDLDIR}
51+
include/SDL2 include
52+
PATHS ${SDL2_PATH}
53+
)
5354

5455
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
55-
set(VC_LIB_PATH_SUFFIX lib/x64)
56+
set(VC_LIB_PATH_SUFFIX lib/x64)
5657
else()
57-
set(VC_LIB_PATH_SUFFIX lib/x86)
58+
set(VC_LIB_PATH_SUFFIX lib/x86)
5859
endif()
5960

6061
find_library(SDL2_IMAGE_LIBRARY
61-
NAMES SDL2_image
62-
HINTS
63-
ENV SDL2IMAGEDIR
64-
ENV SDL2DIR
65-
PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
66-
)
62+
NAMES SDL2_image
63+
HINTS
64+
ENV SDL2IMAGEDIR
65+
ENV SDL2DIR
66+
PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
67+
PATHS ${SDL2_PATH}
68+
)
6769

6870
if(SDL2_IMAGE_INCLUDE_DIR AND EXISTS "${SDL2_IMAGE_INCLUDE_DIR}/SDL_image.h")
69-
file(STRINGS "${SDL2_IMAGE_INCLUDE_DIR}/SDL_image.h" SDL_IMAGE_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_IMAGE_MAJOR_VERSION[ \t]+[0-9]+$")
70-
file(STRINGS "${SDL2_IMAGE_INCLUDE_DIR}/SDL_image.h" SDL2_IMAGE_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL2_IMAGE_MINOR_VERSION[ \t]+[0-9]+$")
71-
file(STRINGS "${SDL2_IMAGE_INCLUDE_DIR}/SDL_image.h" SDL2_IMAGE_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL2_IMAGE_PATCHLEVEL[ \t]+[0-9]+$")
72-
string(REGEX REPLACE "^#define[ \t]+SDL2_IMAGE_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_IMAGE_VERSION_MAJOR "${SDL2_IMAGE_VERSION_MAJOR_LINE}")
73-
string(REGEX REPLACE "^#define[ \t]+SDL2_IMAGE_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_IMAGE_VERSION_MINOR "${SDL2_IMAGE_VERSION_MINOR_LINE}")
74-
string(REGEX REPLACE "^#define[ \t]+SDL2_IMAGE_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_IMAGE_VERSION_PATCH "${SDL2_IMAGE_VERSION_PATCH_LINE}")
75-
set(SDL2_IMAGE_VERSION_STRING ${SDL2_IMAGE_VERSION_MAJOR}.${SDL2_IMAGE_VERSION_MINOR}.${SDL2_IMAGE_VERSION_PATCH})
76-
unset(SDL2_IMAGE_VERSION_MAJOR_LINE)
77-
unset(SDL2_IMAGE_VERSION_MINOR_LINE)
78-
unset(SDL2_IMAGE_VERSION_PATCH_LINE)
79-
unset(SDL2_IMAGE_VERSION_MAJOR)
80-
unset(SDL2_IMAGE_VERSION_MINOR)
81-
unset(SDL2_IMAGE_VERSION_PATCH)
71+
file(STRINGS "${SDL2_IMAGE_INCLUDE_DIR}/SDL_image.h" SDL_IMAGE_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_IMAGE_MAJOR_VERSION[ \t]+[0-9]+$")
72+
file(STRINGS "${SDL2_IMAGE_INCLUDE_DIR}/SDL_image.h" SDL2_IMAGE_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL2_IMAGE_MINOR_VERSION[ \t]+[0-9]+$")
73+
file(STRINGS "${SDL2_IMAGE_INCLUDE_DIR}/SDL_image.h" SDL2_IMAGE_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL2_IMAGE_PATCHLEVEL[ \t]+[0-9]+$")
74+
string(REGEX REPLACE "^#define[ \t]+SDL2_IMAGE_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_IMAGE_VERSION_MAJOR "${SDL2_IMAGE_VERSION_MAJOR_LINE}")
75+
string(REGEX REPLACE "^#define[ \t]+SDL2_IMAGE_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_IMAGE_VERSION_MINOR "${SDL2_IMAGE_VERSION_MINOR_LINE}")
76+
string(REGEX REPLACE "^#define[ \t]+SDL2_IMAGE_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_IMAGE_VERSION_PATCH "${SDL2_IMAGE_VERSION_PATCH_LINE}")
77+
set(SDL2_IMAGE_VERSION_STRING ${SDL2_IMAGE_VERSION_MAJOR}.${SDL2_IMAGE_VERSION_MINOR}.${SDL2_IMAGE_VERSION_PATCH})
78+
unset(SDL2_IMAGE_VERSION_MAJOR_LINE)
79+
unset(SDL2_IMAGE_VERSION_MINOR_LINE)
80+
unset(SDL2_IMAGE_VERSION_PATCH_LINE)
81+
unset(SDL2_IMAGE_VERSION_MAJOR)
82+
unset(SDL2_IMAGE_VERSION_MINOR)
83+
unset(SDL2_IMAGE_VERSION_PATCH)
8284
endif()
8385

8486
set(SDL2_IMAGE_LIBRARIES ${SDL2_IMAGE_LIBRARY})
@@ -87,8 +89,8 @@ set(SDL2_IMAGE_INCLUDE_DIRS ${SDL2_IMAGE_INCLUDE_DIR})
8789
include(FindPackageHandleStandardArgs)
8890

8991
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2_image
90-
REQUIRED_VARS SDL2_IMAGE_LIBRARIES SDL2_IMAGE_INCLUDE_DIRS
91-
VERSION_VAR SDL2_IMAGE_VERSION_STRING)
92+
REQUIRED_VARS SDL2_IMAGE_LIBRARIES SDL2_IMAGE_INCLUDE_DIRS
93+
VERSION_VAR SDL2_IMAGE_VERSION_STRING)
9294

9395
# for backward compatiblity
9496
#set(SDLIMAGE_LIBRARY ${SDL_IMAGE_LIBRARIES})

0 commit comments

Comments
 (0)