Optimize project dir

owent · Jun 20, 2024 · e8a744d · e8a744d
1 parent 2463134
commit e8a744d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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)