chore: cmakelists 小细节修正

MaaXYZ · Sep 26, 2023 · b2286ff · b2286ff
1 parent 286b806
commit b2286ff
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 59 deletions.
diff --git a/source/MaaControlUnit/CMakeLists.txt b/source/MaaControlUnit/CMakeLists.txt
@@ -1,4 +1,4 @@
-file(GLOB_RECURSE maa_control_unit_src *.h *.hpp *.cpp ../include/ControlUnit/*.h)
+file(GLOB_RECURSE maa_control_unit_src *.h *.hpp *.cpp ../include)
 
 add_library(MaaControlUnit SHARED ${maa_control_unit_src})
 
@@ -23,4 +23,4 @@ install(TARGETS MaaControlUnit
     ARCHIVE DESTINATION lib
 )
 
-source_group(TREE ${CMAKE_SOURCE_DIR} FILES ${maa_control_unit_src})
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${maa_control_unit_src})
diff --git a/source/MaaFramework/CMakeLists.txt b/source/MaaFramework/CMakeLists.txt
@@ -1,4 +1,4 @@
-file(GLOB_RECURSE maa_src *.cpp *.h *.hpp ../include/MaaFramework/*.h)
+file(GLOB_RECURSE maa_src *.cpp *.h *.hpp ../include ../../include/MaaFramework)
 
 add_library(MaaFramework SHARED ${maa_src})
 
@@ -32,7 +32,7 @@ install(TARGETS MaaFramework
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../include/MaaFramework" DESTINATION "include" PATTERN "interfaces" EXCLUDE)
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../include/MaaFramework/interfaces" DESTINATION "share")
 
-source_group(TREE ${CMAKE_SOURCE_DIR} FILES ${maa_src})
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${maa_src})
 
 if (WIN32)
   add_custom_command(TARGET MaaFramework POST_BUILD

diff --git a/source/MaaToolKit/CMakeLists.txt b/source/MaaToolKit/CMakeLists.txt
@@ -1,4 +1,4 @@
-file(GLOB_RECURSE maa_toolkit_src *.h *.hpp *.cpp ../include)
+file(GLOB_RECURSE maa_toolkit_src *.cpp *.h *.hpp ../include ../../include/MaaToolKit)
 
 add_library(MaaToolKit SHARED ${maa_toolkit_src})
 
@@ -19,4 +19,4 @@ install(TARGETS MaaToolKit
 )
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../include/MaaToolKit" DESTINATION "include")
 
-source_group(TREE ${CMAKE_SOURCE_DIR} FILES ${maa_toolkit_src})
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${maa_toolkit_src})
diff --git a/source/MaaUtils/CMakeLists.txt b/source/MaaUtils/CMakeLists.txt
@@ -1,4 +1,4 @@
-file(GLOB_RECURSE maa_utils_src *.h *.hpp *.cpp ../include/Utils/*.hpp)
+file(GLOB_RECURSE maa_utils_src *.h *.hpp *.cpp ../include)
 
 add_library(MaaUtils SHARED ${maa_utils_src})
 target_include_directories(MaaUtils
@@ -15,4 +15,4 @@ install(TARGETS MaaUtils
     ARCHIVE DESTINATION lib
 )
 
-source_group(TREE ${CMAKE_SOURCE_DIR} FILES ${maa_utils_src})
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${maa_utils_src})
diff --git a/source/MaaUtils/MaaUtils.vcxproj.filters b/source/MaaUtils/MaaUtils.vcxproj.filters
diff --git a/source/binding/JavaScript/CMakeLists.txt b/source/binding/JavaScript/CMakeLists.txt
@@ -11,4 +11,4 @@ install(TARGETS MaaJSExtra
     ARCHIVE DESTINATION lib
 )
 
-source_group(TREE ${CMAKE_SOURCE_DIR} FILES ${maa_js_src})
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${maa_js_src})