mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 05:39:40 +08:00
827bfad29a
* Replace control file with manifest. * Update portfile and add features. * Added support for multiple specs. * Added OpenGL API features. * Fixed gles1/glsc2 format. * Fixed invalid invoke with default arguments. * Apply format. * Always use compatibility profile. * Replace deprecated cmake commands. * Use `vcpkg_check_features` for no-loader and extensions features. * Add patch to ignore python detection. * Update glad port version. * Remove `core-profile` feature from manifest. * Bump glad port version. * Only set profile, if not provided. Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Added note about custom triplet. Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Use string-append to build spec list. * Invert loader feature and use it by default. * Reset port version. Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Use `version` instead of `version-string`. Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Made API version features inter-dependent. * Also added dependencies if major version jumps. Note that only the latest verison gets passed to the generator anyway. * Apply format conventions. * Bump glad version. * Add note about wgl and glx compatibility. * Bump glad version. Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
22 lines
781 B
Diff
22 lines
781 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index c4031a6..6a106e9 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -23,16 +23,6 @@ project(GLAD VERSION 0.1.34 LANGUAGES C)
|
|
|
|
set(GLAD_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
|
|
|
|
-# Find the python interpreter, set the PYTHON_EXECUTABLE variable
|
|
-if (CMAKE_VERSION VERSION_LESS 3.12)
|
|
- # this logic is deprecated in CMake after 3.12
|
|
- find_package(PythonInterp REQUIRED)
|
|
-else()
|
|
- # the new hotness. This will preferentially find Python3 instead of Python2
|
|
- find_package(Python)
|
|
- set(PYTHON_EXECUTABLE ${Python_EXECUTABLE})
|
|
-endif()
|
|
-
|
|
# Options
|
|
set(GLAD_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE STRING "Output directory")
|
|
set(GLAD_PROFILE "compatibility" CACHE STRING "OpenGL profile")
|