Skip to content
Snippets Groups Projects
Commit a3f787c3 authored by Oscar Fuentes's avatar Oscar Fuentes
Browse files

Put targets on folders, if the IDE supports the feature.

Requires CMake 2.8.3 or newer.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@126094 91177308-0d34-0410-b5e6-96231b3b80d8
parent c8da1eca
No related branches found
No related tags found
No related merge requests found
...@@ -148,6 +148,7 @@ function(clang_tablegen) ...@@ -148,6 +148,7 @@ function(clang_tablegen)
list( GET CTG_DEFAULT_ARGS 0 output_file ) list( GET CTG_DEFAULT_ARGS 0 output_file )
if( CTG_TARGET ) if( CTG_TARGET )
add_custom_target( ${CTG_TARGET} DEPENDS ${output_file} ${CTG_DEPENDS} ) add_custom_target( ${CTG_TARGET} DEPENDS ${output_file} ${CTG_DEPENDS} )
set_target_properties( ${CTG_TARGET} PROPERTIES FOLDER "Clang tablegenning")
endif() endif()
endfunction(clang_tablegen) endfunction(clang_tablegen)
...@@ -205,10 +206,12 @@ macro(add_clang_library name) ...@@ -205,10 +206,12 @@ macro(add_clang_library name)
install(TARGETS ${name} install(TARGETS ${name}
LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
set_target_properties(${name} PROPERTIES FOLDER "Clang libraries")
endmacro(add_clang_library) endmacro(add_clang_library)
macro(add_clang_executable name) macro(add_clang_executable name)
add_llvm_executable( ${name} ${ARGN} ) add_llvm_executable( ${name} ${ARGN} )
set_target_properties(${name} PROPERTIES FOLDER "Clang executables")
endmacro(add_clang_executable) endmacro(add_clang_executable)
include_directories( include_directories(
......
...@@ -67,6 +67,7 @@ if (other_output_dir) ...@@ -67,6 +67,7 @@ if (other_output_dir)
endif () endif ()
add_custom_target(clang-headers ALL DEPENDS ${out_files}) add_custom_target(clang-headers ALL DEPENDS ${out_files})
set_target_properties(clang-headers PROPERTIES FOLDER "Misc")
install(FILES ${files} ${output_dir}/arm_neon.h install(FILES ${files} ${output_dir}/arm_neon.h
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
......
...@@ -69,6 +69,7 @@ if(PYTHONINTERP_FOUND) ...@@ -69,6 +69,7 @@ if(PYTHONINTERP_FOUND)
separate_arguments(LIT_ARGS) separate_arguments(LIT_ARGS)
add_custom_target(clang-test.deps) add_custom_target(clang-test.deps)
set_target_properties(clang-test.deps PROPERTIES FOLDER "Clang tests")
foreach(testdir ${CLANG_TEST_DIRECTORIES}) foreach(testdir ${CLANG_TEST_DIRECTORIES})
add_custom_target(clang-test-${testdir} add_custom_target(clang-test-${testdir}
...@@ -80,6 +81,7 @@ if(PYTHONINTERP_FOUND) ...@@ -80,6 +81,7 @@ if(PYTHONINTERP_FOUND)
${CMAKE_CURRENT_BINARY_DIR}/${testdir} ${CMAKE_CURRENT_BINARY_DIR}/${testdir}
DEPENDS clang c-index-test FileCheck not count DEPENDS clang c-index-test FileCheck not count
COMMENT "Running Clang regression tests in ${testdir}") COMMENT "Running Clang regression tests in ${testdir}")
set_target_properties(clang-test-${testdir} PROPERTIES FOLDER "Clang tests")
endforeach() endforeach()
add_custom_target(clang-test add_custom_target(clang-test
...@@ -92,6 +94,7 @@ if(PYTHONINTERP_FOUND) ...@@ -92,6 +94,7 @@ if(PYTHONINTERP_FOUND)
${LIT_ARGS} ${LIT_ARGS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Running Clang regression tests") COMMENT "Running Clang regression tests")
set_target_properties(clang-test PROPERTIES FOLDER "Clang tests")
add_custom_target(clang-c++tests add_custom_target(clang-c++tests
COMMAND ${PYTHON_EXECUTABLE} COMMAND ${PYTHON_EXECUTABLE}
...@@ -102,6 +105,7 @@ if(PYTHONINTERP_FOUND) ...@@ -102,6 +105,7 @@ if(PYTHONINTERP_FOUND)
${CMAKE_CURRENT_SOURCE_DIR}/../utils/C++Tests ${CMAKE_CURRENT_SOURCE_DIR}/../utils/C++Tests
DEPENDS clang c-index-test FileCheck not count DEPENDS clang c-index-test FileCheck not count
COMMENT "Running Clang regression tests") COMMENT "Running Clang regression tests")
set_target_properties(clang-c++tests PROPERTIES FOLDER "Clang tests")
if( NOT CLANG_BUILT_STANDALONE ) if( NOT CLANG_BUILT_STANDALONE )
add_custom_target(check-all add_custom_target(check-all
...@@ -119,7 +123,7 @@ if(PYTHONINTERP_FOUND) ...@@ -119,7 +123,7 @@ if(PYTHONINTERP_FOUND)
llvm-dis opt llvm-dis opt
FileCheck count not FileCheck count not
) )
set_target_properties(check-all PROPERTIES FOLDER "Clang tests")
endif() endif()
add_dependencies(clang-test clang-test.deps) add_dependencies(clang-test clang-test.deps)
......
...@@ -46,6 +46,7 @@ add_custom_target(clang++ ALL ...@@ -46,6 +46,7 @@ add_custom_target(clang++ ALL
"${LLVM_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/clang${CMAKE_EXECUTABLE_SUFFIX}" "${LLVM_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/clang${CMAKE_EXECUTABLE_SUFFIX}"
"${clang_pp}" "${clang_pp}"
DEPENDS clang) DEPENDS clang)
set_target_properties(clang++ PROPERTIES FOLDER "Clang executables")
set_property(DIRECTORY APPEND set_property(DIRECTORY APPEND
PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${clang_pp}) PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${clang_pp})
......
...@@ -28,9 +28,11 @@ function(add_clang_unittest) ...@@ -28,9 +28,11 @@ function(add_clang_unittest)
endif() endif()
add_clang_executable(${test_name}Tests ${CLANG_UNITTEST_DEFAULT_ARGS}) add_clang_executable(${test_name}Tests ${CLANG_UNITTEST_DEFAULT_ARGS})
add_dependencies(ClangUnitTests ${test_name}Tests) add_dependencies(ClangUnitTests ${test_name}Tests)
set_target_properties(${test_name}Tests PROPERTIES FOLDER "Clang tests")
endfunction() endfunction()
add_custom_target(ClangUnitTests) add_custom_target(ClangUnitTests)
set_target_properties(ClangUnitTests PROPERTIES FOLDER "Clang tests")
include_directories(${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include) include_directories(${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include)
add_definitions(-DGTEST_HAS_RTTI=0) add_definitions(-DGTEST_HAS_RTTI=0)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment