diff options
| author | archie2x <[email protected]> | 2022-08-09 00:52:56 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-08-09 09:52:56 +0200 |
| commit | e87caa268784e8947f76bf3f6b45699553337709 (patch) | |
| tree | 3d18ef872e90f9bff290d2cb3ee006ef0fecb996 /cmake/LibraryConfigurations.cmake | |
| parent | b0f3a2c217a0f5cc775b8d249c3c508d2c6a1c12 (diff) | |
| download | raylib-e87caa268784e8947f76bf3f6b45699553337709.tar.gz raylib-e87caa268784e8947f76bf3f6b45699553337709.zip | |
Fix #2621: Set CMP0054 policy to NEW and appropriately quote ${PLATFORM} (#2622)
Diffstat (limited to 'cmake/LibraryConfigurations.cmake')
| -rw-r--r-- | cmake/LibraryConfigurations.cmake | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cmake/LibraryConfigurations.cmake b/cmake/LibraryConfigurations.cmake index 7d7d4c8c..1e60e828 100644 --- a/cmake/LibraryConfigurations.cmake +++ b/cmake/LibraryConfigurations.cmake @@ -1,6 +1,6 @@ if (${PLATFORM} MATCHES "Desktop") set(PLATFORM_CPP "PLATFORM_DESKTOP") - + if (APPLE) # Need to force OpenGL 3.3 on OS X # See: https://github.com/raysan5/raylib/issues/341 @@ -22,11 +22,11 @@ if (${PLATFORM} MATCHES "Desktop") if ("${OPENGL_LIBRARIES}" STREQUAL "") set(OPENGL_LIBRARIES "GL") endif () - + if ("${CMAKE_SYSTEM_NAME}" MATCHES "(Net|Open)BSD") find_library(OSS_LIBRARY ossaudio) endif () - + set(LIBS_PRIVATE m atomic pthread ${OPENGL_LIBRARIES} ${OSS_LIBRARY}) if (USE_AUDIO) @@ -48,16 +48,16 @@ elseif (${PLATFORM} MATCHES "Android") add_definitions(-DANDROID -D__ANDROID_API__=21) include_directories(${ANDROID_NDK}/sources/android/native_app_glue) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--exclude-libs,libatomic.a -Wl,--build-id -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--warn-shared-textrel -Wl,--fatal-warnings -u ANativeActivity_onCreate -Wl,-undefined,dynamic_lookup") - + find_library(OPENGL_LIBRARY OpenGL) set(LIBS_PRIVATE m log android EGL GLESv2 OpenSLES atomic c) elseif (${PLATFORM} MATCHES "Raspberry Pi") set(PLATFORM_CPP "PLATFORM_RPI") set(GRAPHICS "GRAPHICS_API_OPENGL_ES2") - + add_definitions(-D_DEFAULT_SOURCE) - + find_library(GLESV2 brcmGLESv2 HINTS /opt/vc/lib) find_library(EGL brcmEGL HINTS /opt/vc/lib) find_library(BCMHOST bcm_host HINTS /opt/vc/lib) @@ -65,19 +65,19 @@ elseif (${PLATFORM} MATCHES "Raspberry Pi") link_directories(/opt/vc/lib) set(LIBS_PRIVATE ${GLESV2} ${EGL} ${BCMHOST} pthread rt m dl) -elseif (${PLATFORM} MATCHES "DRM") +elseif ("${PLATFORM}" MATCHES "DRM") set(PLATFORM_CPP "PLATFORM_DRM") set(GRAPHICS "GRAPHICS_API_OPENGL_ES2") - + add_definitions(-D_DEFAULT_SOURCE) add_definitions(-DEGL_NO_X11) add_definitions(-DPLATFORM_DRM) - + find_library(GLESV2 GLESv2) find_library(EGL EGL) find_library(DRM drm) find_library(GBM gbm) - + if (NOT CMAKE_CROSSCOMPILING) include_directories(/usr/include/libdrm) endif () |
