Restored simplified form of vfc_set_folder() in CMake.

Respects the VFC_ROOT_FOLDER without adding unnecessary sub-folders.

Author: akb825

cmake/config.cmake

@@ -44,6 +44,10 @@ if (VFC_INSTALL AND VFC_INSTALL_SET_RPATH)
 	endif()
 endif()
 
+function(vfc_set_folder target)
+	set_property(TARGET ${target} PROPERTY FOLDER ${VFC_ROOT_FOLDER})
+endfunction()
+
 function(vfc_setup_filters)
 	set(options)
 	set(oneValueArgs SRC_DIR INCLUDE_DIR)

doc/CMakeLists.txt

@@ -24,6 +24,8 @@ add_custom_command(OUTPUT ${outputFile}
 	COMMENT "Generating API documentation with Doxygen" VERBATIM)
 add_custom_target(vfc_doc ALL DEPENDS ${outputFile})
 
+vfc_set_folder(vfc_doc)
+
 if (VFC_INSTALL)
 	install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION ${CMAKE_INSTALL_DOCDIR})
 endif()

lib/CMakeLists.txt

@@ -4,6 +4,7 @@ add_library(vfc_lib ${VFC_LIB} ${sources})
 set_target_properties(vfc_lib PROPERTIES OUTPUT_NAME vfc)
 target_include_directories(vfc_lib PRIVATE glm src)
 
+vfc_set_folder(vfc_lib)
 vfc_setup_filters(SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src
 	INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/VFC
 	FILES ${sources})

lib/test/CMakeLists.txt

@@ -10,4 +10,5 @@ add_executable(vfc_lib_test ${sources})
 target_include_directories(vfc_lib_test PRIVATE ${GTEST_INCLUDE_DIRS} ../glm)
 target_link_libraries(vfc_lib_test PRIVATE VFC::lib ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 
+vfc_set_folder(vfc_lib_test)
 add_test(NAME VFCLibTest COMMAND vfc_lib_test)

tool/CMakeLists.txt

@@ -4,6 +4,7 @@ add_executable(vfc ${sources})
 target_link_libraries(vfc PRIVATE VFC::lib)
 target_include_directories(vfc PRIVATE rapidjson/include)
 
+vfc_set_folder(vfc)
 vfc_install_executable(vfc tool)
 
 add_subdirectory(test)

tool/test/CMakeLists.txt

@@ -12,6 +12,7 @@ target_include_directories(vfc_tool_test PRIVATE ${GTEST_INCLUDE_DIRS} .. ../rap
 target_link_libraries(vfc_tool_test PRIVATE VFC::lib ${GTEST_BOTH_LIBRARIES}
 	${CMAKE_THREAD_LIBS_INIT})
 
+vfc_set_folder(vfc_tool_test)
 add_test(NAME VFCToolTest COMMAND vfc_tool_test)
 
 set(functionalTestPath ${CMAKE_CURRENT_SOURCE_DIR}/functional)