mewin/vulkan-headers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cmake: Update min to 3.15

Browse Source 
- Removes conditional 3.15 logic
- Guarantees usage of --install/--loglevel
This commit is contained in:
Juan Ramos 2023-02-22 11:39:08 -07:00 committed by Juan Ramos
parent 6c68315849
commit 115820a6e5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/linux.yml vendored
View File

@ -27,7 +27,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: lukka/get-cmake@latest - uses: lukka/get-cmake@latest
with: with:
cmakeVersion: 3.15.0 cmakeVersion: 3.17.0
- name: Configure Vulkan-Headers - name: Configure Vulkan-Headers
run: cmake -S . -B build -G "Ninja" run: cmake -S . -B build -G "Ninja"
- name: Install Vulkan-Headers - name: Install Vulkan-Headers
@ -53,6 +53,8 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: lukka/get-cmake@latest - uses: lukka/get-cmake@latest
with: with:
cmakeVersion: 3.14.0 cmakeVersion: 3.15.0
- name: Configure Vulkan-Headers - name: Configure Vulkan-Headers
run: cmake -S . -B build/ -G "Ninja" run: cmake -S . -B build/ -G "Ninja" --loglevel=DEBUG
- name: Install Vulkan-Headers
run: cmake --install build/ --prefix build/install

6
CMakeLists.txt
View File

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# ~~~ # ~~~
cmake_minimum_required(VERSION 3.14...3.25) cmake_minimum_required(VERSION 3.15...3.25)
function(vlk_get_header_version) function(vlk_get_header_version)
set(vulkan_core_header_file "${CMAKE_CURRENT_SOURCE_DIR}/include/vulkan/vulkan_core.h") set(vulkan_core_header_file "${CMAKE_CURRENT_SOURCE_DIR}/include/vulkan/vulkan_core.h")
@ -43,9 +43,7 @@ vlk_get_header_version()
project(Vulkan-Headers LANGUAGES C VERSION ${VK_VERSION_STRING}) project(Vulkan-Headers LANGUAGES C VERSION ${VK_VERSION_STRING})
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15") message(DEBUG "${PROJECT_NAME} = ${PROJECT_VERSION}")
message(DEBUG "${PROJECT_NAME} = ${PROJECT_VERSION}")
endif()
add_library(Vulkan-Headers INTERFACE) add_library(Vulkan-Headers INTERFACE)
target_include_directories(Vulkan-Headers INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>) target_include_directories(Vulkan-Headers INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)