diff --git a/CMakeLists.txt b/CMakeLists.txt index 22f0bd71d9..bcdac6dce5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.28) project(MAA) -include(src/MaaUtils/MaaUtils.cmake) - option(BUILD_WPF_GUI "build MaaWpfGui" ${WIN32}) option(BUILD_DEBUG_DEMO "build debug demo" OFF) option(BUILD_XCFRAMEWORK "build xcframework for macOS app" OFF) @@ -14,6 +12,12 @@ option(INSTALL_FLATTEN "do not use bin lib include directory" ON) option(WITH_EMULATOR_EXTRAS "build with emulator extras" ${WIN32}) option(WITH_HASH_VERSION "generate version from git hash" OFF) +if(INSTALL_FLATTEN) + set(RPATH_LIBRARY_INSTALL_DIR .) + set(MaaCore_install_flatten_args RUNTIME DESTINATION . LIBRARY DESTINATION . PUBLIC_HEADER DESTINATION .) +endif() + +include(src/MaaUtils/MaaUtils.cmake) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules") include(${PROJECT_SOURCE_DIR}/cmake/config.cmake) include(${PROJECT_SOURCE_DIR}/cmake/utils.cmake) @@ -22,10 +26,6 @@ if(APPLE) include(${PROJECT_SOURCE_DIR}/cmake/macos.cmake) endif() -if(INSTALL_FLATTEN) - set(MaaCore_install_flatten_args RUNTIME DESTINATION . LIBRARY DESTINATION . PUBLIC_HEADER DESTINATION .) -endif() - add_library(HeaderOnlyLibraries INTERFACE) target_include_directories(HeaderOnlyLibraries INTERFACE 3rdparty/include) @@ -48,4 +48,3 @@ endif() if(BUILD_DEBUG_DEMO OR BUILD_SMOKE_TEST) add_subdirectory(src/Cpp) endif() - diff --git a/src/MaaUtils b/src/MaaUtils index 962e4e116c..f0c49deecb 160000 --- a/src/MaaUtils +++ b/src/MaaUtils @@ -1 +1 @@ -Subproject commit 962e4e116ce111feaa75d899c84449ee480901c7 +Subproject commit f0c49deecbf9d0f212db68cf412ca3a24c2ec6d6