From e8a744d1b240fc095c0ea055957fe3a0ba5594ba Mon Sep 17 00:00:00 2001
From: owent <owentou@tencent.com>
Date: Fri, 21 Jun 2024 00:12:07 +0800
Subject: [PATCH] Optimize project dir

---
 CMakeLists.txt               | 4 +---
 atframework/cmake-toolset    | 2 +-
 sample/CMakeLists.txt        | 4 +---
 test/test.build_bin.cmake    | 6 ++----
 tools/uuidgen/CMakeLists.txt | 2 +-
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35de5e17..c325fe2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -258,9 +258,7 @@ if(PROJECT_ATFRAME_UTILS_PUBLIC_DEFINITIONS)
   target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_ATFRAME_UTILS_PUBLIC_DEFINITIONS})
 endif()
 
-if(MSVC)
-  set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER "atframework")
-endif(MSVC)
+set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER "atframework")
 
 include(AtframeworkToolsetCommonDefinitions)
 if(BUILD_SHARED_LIBS OR ATFRAMEWORK_USE_DYNAMIC_LIBRARY)
diff --git a/atframework/cmake-toolset b/atframework/cmake-toolset
index 70386574..944b6b33 160000
--- a/atframework/cmake-toolset
+++ b/atframework/cmake-toolset
@@ -1 +1 @@
-Subproject commit 70386574fd7392fa1c2a4e1cdffdb870b0e2c266
+Subproject commit 944b6b33c9293168dcb8e07316871cdee75e21bf
diff --git a/sample/CMakeLists.txt b/sample/CMakeLists.txt
index a2c7e24e..86973866 100644
--- a/sample/CMakeLists.txt
+++ b/sample/CMakeLists.txt
@@ -18,9 +18,7 @@ set_target_properties(
              BUILD_WITH_INSTALL_RPATH NO
              BUILD_RPATH_USE_ORIGIN YES)
 
-if(MSVC)
-  set_property(TARGET ${BIN_NAME} PROPERTY FOLDER "atframework/sample")
-endif(MSVC)
+set_property(TARGET ${BIN_NAME} PROPERTY FOLDER "atframework/sample")
 
 add_test(NAME "atframe_utils.sample" COMMAND "$<TARGET_FILE:${BIN_NAME}>")
 set_tests_properties("atframe_utils.sample" PROPERTIES LABELS "atframe_utils;atframe_utils.sample")
diff --git a/test/test.build_bin.cmake b/test/test.build_bin.cmake
index 3725aa7b..794c18eb 100644
--- a/test/test.build_bin.cmake
+++ b/test/test.build_bin.cmake
@@ -46,10 +46,8 @@ function(atframe_add_test_executable TARGET_NAME)
   endif()
 
   add_executable(${TARGET_NAME} ${ARGN})
-  if(MSVC)
-    set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "atframework/test")
-    # add_target_properties(${TARGET_NAME} LINK_FLAGS /NODEFAULTLIB:library)
-  endif()
+  set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "atframework/test")
+  # add_target_properties(${TARGET_NAME} LINK_FLAGS /NODEFAULTLIB:library)
   set_target_properties(
     ${TARGET_NAME}
     PROPERTIES INSTALL_RPATH_USE_LINK_PATH YES
diff --git a/tools/uuidgen/CMakeLists.txt b/tools/uuidgen/CMakeLists.txt
index ca28cf2b..71972acc 100644
--- a/tools/uuidgen/CMakeLists.txt
+++ b/tools/uuidgen/CMakeLists.txt
@@ -14,8 +14,8 @@ target_link_libraries(${BIN_NAME} ${PROJECT_NAME})
 
 target_compile_options(${BIN_NAME} PRIVATE ${COMPILER_STRICT_EXTRA_CFLAGS} ${COMPILER_STRICT_CFLAGS})
 
+set_property(TARGET ${BIN_NAME} PROPERTY FOLDER "atframework/tools")
 if(MSVC)
-  set_property(TARGET ${BIN_NAME} PROPERTY FOLDER "atframework/tools")
   add_target_properties(${BIN_NAME} LINK_FLAGS /NODEFAULTLIB:library)
 endif(MSVC)