diff options
| -rw-r--r-- | cmake/modules/FindOpenGLES.cmake | 13 | ||||
| -rw-r--r-- | cmake/modules/FindOpenGl.cmake | 13 | ||||
| -rw-r--r-- | tools/depends/native/cmake/CMAKE-VERSION | 4 | ||||
| -rw-r--r-- | tools/depends/native/cmake/Makefile | 11 |
4 files changed, 6 insertions, 35 deletions
diff --git a/cmake/modules/FindOpenGLES.cmake b/cmake/modules/FindOpenGLES.cmake index 5dbb42e514..92172bd628 100644 --- a/cmake/modules/FindOpenGLES.cmake +++ b/cmake/modules/FindOpenGLES.cmake @@ -29,19 +29,6 @@ if(NOT TARGET OpenGL::GLES) REQUIRED_VARS OPENGLES_gl_LIBRARY OPENGLES_INCLUDE_DIR) if(OPENGLES_FOUND) - if(CORE_SYSTEM_NAME STREQUAL darwin_embedded) - # Cmake only added support for Frameworks as the IMPORTED_LOCATION as of 3.28 - # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8586 - # Until we move to cmake 3.28 as minimum, explicitly set to binary inside framework - if(OPENGLES_gl_LIBRARY MATCHES "/([^/]+)\\.framework$") - set(_gles_fw "${OPENGLES_gl_LIBRARY}/${CMAKE_MATCH_1}") - if(EXISTS "${_gles_fw}.tbd") - string(APPEND _gles_fw ".tbd") - endif() - set(OPENGLES_gl_LIBRARY ${_gles_fw}) - endif() - endif() - if(${OPENGLES_gl_LIBRARY} MATCHES ".+\.so$") add_library(OpenGL::GLES SHARED IMPORTED) else() diff --git a/cmake/modules/FindOpenGl.cmake b/cmake/modules/FindOpenGl.cmake index cabee46db3..1af7469e18 100644 --- a/cmake/modules/FindOpenGl.cmake +++ b/cmake/modules/FindOpenGl.cmake @@ -26,19 +26,6 @@ if(NOT TARGET OpenGL::GL) REQUIRED_VARS OPENGL_gl_LIBRARY OPENGL_INCLUDE_DIR) if(OPENGL_FOUND) - if(CORE_SYSTEM_NAME STREQUAL osx) - # Cmake only added support for Frameworks as the IMPORTED_LOCATION as of 3.28 - # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8586 - # Until we move to cmake 3.28 as minimum, explicitly set to binary inside framework - if(OPENGL_gl_LIBRARY MATCHES "/([^/]+)\\.framework$") - set(_gl_fw "${OPENGL_gl_LIBRARY}/${CMAKE_MATCH_1}") - if(EXISTS "${_gl_fw}.tbd") - string(APPEND _gl_fw ".tbd") - endif() - set(OPENGL_gl_LIBRARY ${_gl_fw}) - endif() - endif() - add_library(OpenGL::GL UNKNOWN IMPORTED) set_target_properties(OpenGL::GL PROPERTIES IMPORTED_LOCATION "${OPENGL_gl_LIBRARY}" diff --git a/tools/depends/native/cmake/CMAKE-VERSION b/tools/depends/native/cmake/CMAKE-VERSION new file mode 100644 index 0000000000..28fa53e725 --- /dev/null +++ b/tools/depends/native/cmake/CMAKE-VERSION @@ -0,0 +1,4 @@ +APPNAME=cmake +VERSION=3.29.3 +ARCHIVE=$(APPNAME)-$(VERSION).tar.gz +SHA512=930060cf484a769992ebc798d5e81984560b2cd7e163db7053181ad842656ccd0085e7e077c9c620e719d212f78283ca0db19bec5491a355d38078bbe0bac254 diff --git a/tools/depends/native/cmake/Makefile b/tools/depends/native/cmake/Makefile index e6f37b12a0..7d8faa14e2 100644 --- a/tools/depends/native/cmake/Makefile +++ b/tools/depends/native/cmake/Makefile @@ -1,13 +1,6 @@ -include ../../Makefile.include +include ../../Makefile.include CMAKE-VERSION ../../download-files.include PLATFORM=$(NATIVEPLATFORM) -DEPS = ../../Makefile.include Makefile ../../download-files.include - -APPNAME=cmake -VERSION=3.26.4 -SOURCE=$(APPNAME)-$(VERSION) -ARCHIVE=$(SOURCE).tar.gz -SHA512=fe817c8d5e247db3f0a9a58ee37c466a47220100d9e90711cd5d06c223cef87e41d1a756e75d1537e5f8cd010dcb8971cbeab4684b1ac12bcecf84bf7b720167 -include ../../download-files.include +DEPS = ../../Makefile.include Makefile CMAKE-VERSION ../../download-files.include # configuration settings |