From 458545dfe382ce7c731fc311706e403a6da8428d Mon Sep 17 00:00:00 2001 From: hyzboy Date: Sat, 21 Jan 2023 19:48:09 +0800 Subject: [PATCH] renamed HGL_MATH_LIB instead of HGL_GLM_LIB --- cm_modules.cmake | 1 + math.cmake | 4 ++-- vulkan.cmake | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cm_modules.cmake b/cm_modules.cmake index 73583f8..2e9b524 100644 --- a/cm_modules.cmake +++ b/cm_modules.cmake @@ -5,6 +5,7 @@ macro(add_cm_library module_name project_folder) IF(WIN32) add_library(${module_name} STATIC ${SOURCE_FILES}) + target_link_libraries(${module_name} PRIVATE ${HGL_MATH_LIB}) ELSE() add_library(${module_name} SHARED ${SOURCE_FILES}) ENDIF(WIN32) diff --git a/math.cmake b/math.cmake index 4522e15..c272fbb 100644 --- a/math.cmake +++ b/math.cmake @@ -4,7 +4,7 @@ add_definitions(-DGLM_FORCE_DEPTH_ZERO_TO_ONE) add_definitions(-DGLM_ENABLE_EXPERIMENTAL) if(WIN32) - SET(HGL_GLM_LIB glm::glm) + SET(HGL_MATH_LIB glm::glm) else() - SET(HGL_GLM_LIB GLM) + SET(HGL_MATH_LIB GLM) endif() diff --git a/vulkan.cmake b/vulkan.cmake index 4be9e70..e19dc79 100644 --- a/vulkan.cmake +++ b/vulkan.cmake @@ -3,8 +3,8 @@ include(FindVulkan) if(CMAKE_SYSTEM_NAME STREQUAL "Windows") add_definitions(-DVK_USE_PLATFORM_WIN32_KHR -DWIN32_LEAN_AND_MEAN) elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") - add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR) -elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR) +elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") add_definitions(-DVK_USE_PLATFORM_MACOS_MVK) elseif(UNIX) add_definitions(-DVK_USE_PLATFORM_XCB_KHR)