SunRed/SpaceCadetPinball
1
0
Fork 0
mirror of https://github.com/k4zmu2a/SpaceCadetPinball.git synced 2024-11-24 01:40:18 +01:00
Code Issues Releases Activity

Add libs search paths to CMakeLists.txt instead of find files

Browse source
This commit is contained in:
Orazio 2023-07-31 11:54:07 +02:00
parent 3be4c42a4a
commit 5a9c05656d
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -24,6 +24,8 @@ if(APPLE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH true) set(CMAKE_BUILD_WITH_INSTALL_RPATH true)
set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks") set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks")
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64") set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
list(APPEND SDL2_PATH "${CMAKE_CURRENT_LIST_DIR}/extern")
list(APPEND SDL2_MIXER_PATH "${CMAKE_CURRENT_LIST_DIR}/extern")
endif() endif()
# SDL2main is not needed # SDL2main is not needed

1
CMakeModules/FindSDL2.cmake
View file

@ -77,7 +77,6 @@ SET(SDL2_SEARCH_PATHS
/opt/csw # Blastwave /opt/csw # Blastwave
/opt /opt
${SDL2_PATH} ${SDL2_PATH}
${CMAKE_SOURCE_DIR}/extern
) )
FIND_PATH(SDL2_INCLUDE_DIR SDL.h FIND_PATH(SDL2_INCLUDE_DIR SDL.h

9
CMakeModules/FindSDL2_mixer.cmake
View file

@ -42,11 +42,6 @@
# (To distribute this file outside of CMake, substitute the full # (To distribute this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
SET(SDL2_MIXER_SEARCH_PATHS
${SDL2_MIXER_PATH}
${CMAKE_SOURCE_DIR}/extern
)
find_path(SDL2_MIXER_INCLUDE_DIR SDL_mixer.h find_path(SDL2_MIXER_INCLUDE_DIR SDL_mixer.h
HINTS HINTS
ENV SDL2MIXERDIR ENV SDL2MIXERDIR
@ -54,7 +49,7 @@ find_path(SDL2_MIXER_INCLUDE_DIR SDL_mixer.h
PATH_SUFFIXES SDL2 PATH_SUFFIXES SDL2
# path suffixes to search inside ENV{SDLDIR} # path suffixes to search inside ENV{SDLDIR}
include/SDL2 include include/SDL2 include
PATHS ${SDL2_MIXER_SEARCH_PATHS} PATHS ${SDL2_MIXER_PATH}
) )
if(CMAKE_SIZEOF_VOID_P EQUAL 8) if(CMAKE_SIZEOF_VOID_P EQUAL 8)
@ -69,7 +64,7 @@ find_library(SDL2_MIXER_LIBRARY
ENV SDL2MIXERDIR ENV SDL2MIXERDIR
ENV SDL2DIR ENV SDL2DIR
PATH_SUFFIXES lib bin ${VC_LIB_PATH_SUFFIX} PATH_SUFFIXES lib bin ${VC_LIB_PATH_SUFFIX}
PATHS ${SDL2_MIXER_SEARCH_PATHS} PATHS ${SDL2_MIXER_PATH}
) )
if(SDL2_MIXER_INCLUDE_DIR AND EXISTS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h") if(SDL2_MIXER_INCLUDE_DIR AND EXISTS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h")