From b502e5cce0128f2ab09e828a30c0718142c8a62e Mon Sep 17 00:00:00 2001 From: ZhuohaoHe Date: Fri, 9 Aug 2024 16:00:35 -0400 Subject: [PATCH] update 3rd.cmake to pass the CI Signed-off-by: ZhuohaoHe --- CMakePresets.json | 15 ++++----------- cmake/3rd.cmake | 4 ---- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 744f911..d01acbd 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -46,7 +46,7 @@ } }, { - "name": "config-mac", + "name": "config-macos", "hidden": true, "inherits": [ "config-base" ], "displayName": "config-base", @@ -72,20 +72,13 @@ "description": "build base configurePresets" }, { - "name": "build-mac", + "name": "build-macos", "hidden": false, "inherits": [ - "config-mac" + "config-macos" ], - "displayName": "build-mac", + "displayName": "build-macos", "description": "macOS build configurePresets" } - ], - "buildPresets": [ - { - "name": "build", - "displayName": "Build", - "configurePreset": "config-base" - } ] } \ No newline at end of file diff --git a/cmake/3rd.cmake b/cmake/3rd.cmake index d22cd05..2cf4f9e 100644 --- a/cmake/3rd.cmake +++ b/cmake/3rd.cmake @@ -103,10 +103,6 @@ CPMAddPackage( GITHUB_REPOSITORY g-truc/glm GIT_TAG 1.0.1 ) -if (glm_ADDED) - add_library(glm INTERFACE) - target_include_directories(glm INTERFACE ${glm_SOURCE_DIR}) -endif () # https://github.com/nothings/stb.git CPMAddPackage(