Enables USE_FOLDERS in CMakeLists. (Stellarium#183)

Al3x4n · Jun 10, 2018 · 6a1d60f · 6a1d60f
1 parent 3a93883
commit 6a1d60f
Show file tree

Hide file tree

Showing 38 changed files with 101 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,6 +23,8 @@ ENDIF()
 # warn about deprecated stuff so that we may try fixing it
 SET(CMAKE_WARN_DEPRECATED 1)
 
+SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
+
 ########### Project name ###########
 PROJECT(Stellarium)
 # Use integer versions instead of strings for easier handling if required
@@ -359,6 +361,7 @@ ADD_PLUGIN(TelescopeControl 1)
 # Custom target used to manage dependencies of stellarium -> Static plugins
 # It is important that static plugins are compiled before stellarium main executable is linked
 ADD_CUSTOM_TARGET(AllStaticPlugins ALL)
+SET_TARGET_PROPERTIES(AllStaticPlugins PROPERTIES FOLDER "plugins")
 
 ########### Find packages ###########
 FIND_PACKAGE(Qt5Core REQUIRED)
@@ -646,6 +649,7 @@ CONFIGURE_FILE(
 
 ADD_CUSTOM_TARGET(uninstall
      "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+SET_TARGET_PROPERTIES(uninstall PROPERTIES FOLDER "src")
 
 ########### Packaging info for CPack ###########
 

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
@@ -20,6 +20,7 @@ ADD_CUSTOM_COMMAND(
 	TARGET splash
 	COMMAND ${CMAKE_COMMAND} -E copy ${_splashSrcFile} ${_splashDstFile}
 )
+SET_TARGET_PROPERTIES(splash PROPERTIES FOLDER "data")
 
 ########### icon target ###############
 ADD_CUSTOM_TARGET(icon ALL)
@@ -44,6 +45,7 @@ ADD_CUSTOM_COMMAND(
 	TARGET icon
 	COMMAND ${CMAKE_COMMAND} -E copy ${_iconSrcFile} ${_iconDstFile}
 )
+SET_TARGET_PROPERTIES(icon PROPERTIES FOLDER "data")
 
 # install splash and icon
 IF(MACOSX)

diff --git a/plugins/AngleMeasure/src/CMakeLists.txt b/plugins/AngleMeasure/src/CMakeLists.txt
@@ -24,3 +24,5 @@ TARGET_LINK_LIBRARIES(AngleMeasure-static Qt5::Core Qt5::Widgets)
 SET_TARGET_PROPERTIES(AngleMeasure-static PROPERTIES OUTPUT_NAME "AngleMeasure")
 SET_TARGET_PROPERTIES(AngleMeasure-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins AngleMeasure-static)
+
+SET_TARGET_PROPERTIES(AngleMeasure-static PROPERTIES FOLDER "plugins/AngleMeasure")
diff --git a/plugins/ArchaeoLines/src/CMakeLists.txt b/plugins/ArchaeoLines/src/CMakeLists.txt
@@ -24,3 +24,5 @@ TARGET_LINK_LIBRARIES(ArchaeoLines-static Qt5::Core Qt5::Widgets)
 SET_TARGET_PROPERTIES(ArchaeoLines-static PROPERTIES OUTPUT_NAME "ArchaeoLines")
 SET_TARGET_PROPERTIES(ArchaeoLines-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins ArchaeoLines-static)
+
+SET_TARGET_PROPERTIES(ArchaeoLines-static PROPERTIES FOLDER "plugins/ArchaeoLines")
diff --git a/plugins/CompassMarks/src/CMakeLists.txt b/plugins/CompassMarks/src/CMakeLists.txt
@@ -15,3 +15,5 @@ TARGET_LINK_LIBRARIES(CompassMarks-static Qt5::Core Qt5::Widgets)
 SET_TARGET_PROPERTIES(CompassMarks-static PROPERTIES OUTPUT_NAME "CompassMarks")
 SET_TARGET_PROPERTIES(CompassMarks-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins CompassMarks-static)
+
+SET_TARGET_PROPERTIES(CompassMarks-static PROPERTIES FOLDER "plugins/CompassMarks")
diff --git a/plugins/EquationOfTime/src/CMakeLists.txt b/plugins/EquationOfTime/src/CMakeLists.txt
@@ -30,3 +30,5 @@ TARGET_LINK_LIBRARIES(EquationOfTime-static Qt5::Core Qt5::Widgets)
 SET_TARGET_PROPERTIES(EquationOfTime-static PROPERTIES OUTPUT_NAME "EquationOfTime")
 SET_TARGET_PROPERTIES(EquationOfTime-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins EquationOfTime-static)
+
+SET_TARGET_PROPERTIES(EquationOfTime-static PROPERTIES FOLDER "plugins/EquationOfTime")
diff --git a/plugins/Exoplanets/src/CMakeLists.txt b/plugins/Exoplanets/src/CMakeLists.txt
@@ -29,3 +29,6 @@ TARGET_LINK_LIBRARIES(Exoplanets-static Qt5::Core Qt5::Network Qt5::Widgets qcus
 SET_TARGET_PROPERTIES(Exoplanets-static PROPERTIES OUTPUT_NAME "Exoplanets")
 SET_TARGET_PROPERTIES(Exoplanets-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins Exoplanets-static)
+
+SET_TARGET_PROPERTIES(Exoplanets-static PROPERTIES FOLDER "plugins/Exoplanets")
+
diff --git a/plugins/FOV/src/CMakeLists.txt b/plugins/FOV/src/CMakeLists.txt
@@ -27,3 +27,5 @@ TARGET_LINK_LIBRARIES(FOV-static Qt5::Core Qt5::Widgets)
 SET_TARGET_PROPERTIES(FOV-static PROPERTIES OUTPUT_NAME "FOV")
 SET_TARGET_PROPERTIES(FOV-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins FOV-static)
+
+SET_TARGET_PROPERTIES(FOV-static PROPERTIES FOLDER "plugins/FOV")
diff --git a/plugins/HelloStelModule/src/CMakeLists.txt b/plugins/HelloStelModule/src/CMakeLists.txt
@@ -14,3 +14,4 @@ TARGET_LINK_LIBRARIES(HelloStelModule-static Qt5::Core Qt5::Gui)
 SET_TARGET_PROPERTIES(HelloStelModule-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins HelloStelModule-static)
 
+SET_TARGET_PROPERTIES(HelloStelModule-static PROPERTIES FOLDER "plugins/HelloStelModule")
diff --git a/plugins/LogBook/src/CMakeLists.txt b/plugins/LogBook/src/CMakeLists.txt
@@ -120,3 +120,4 @@ IF(BUILD_STATIC_PLUGINS)
      ADD_DEPENDENCIES(AllStaticPlugins LogBook-static)
 ENDIF()
 
+SET_TARGET_PROPERTIES(LogBook-static PROPERTIES FOLDER "plugins/LogBook")
diff --git a/plugins/MeteorShowers/src/CMakeLists.txt b/plugins/MeteorShowers/src/CMakeLists.txt
@@ -38,3 +38,5 @@ TARGET_LINK_LIBRARIES(MeteorShowers-static Qt5::Core Qt5::Network Qt5::Widgets)
 SET_TARGET_PROPERTIES(MeteorShowers-static PROPERTIES OUTPUT_NAME "MeteorShowers")
 SET_TARGET_PROPERTIES(MeteorShowers-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins MeteorShowers-static)
+
+SET_TARGET_PROPERTIES(MeteorShowers-static PROPERTIES FOLDER "plugins/MeteorShowers")
diff --git a/plugins/NavStars/src/CMakeLists.txt b/plugins/NavStars/src/CMakeLists.txt
@@ -28,3 +28,5 @@ TARGET_LINK_LIBRARIES(NavStars-static Qt5::Core Qt5::Widgets)
 SET_TARGET_PROPERTIES(NavStars-static PROPERTIES OUTPUT_NAME "NavStars")
 SET_TARGET_PROPERTIES(NavStars-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins NavStars-static)
+
+SET_TARGET_PROPERTIES(NavStars-static PROPERTIES FOLDER "plugins/NavStars")
diff --git a/plugins/Novae/src/CMakeLists.txt b/plugins/Novae/src/CMakeLists.txt
@@ -30,3 +30,5 @@ TARGET_LINK_LIBRARIES(Novae-static Qt5::Core Qt5::Network Qt5::Widgets)
 SET_TARGET_PROPERTIES(Novae-static PROPERTIES OUTPUT_NAME "Novae")
 SET_TARGET_PROPERTIES(Novae-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins Novae-static)
+
+SET_TARGET_PROPERTIES(Novae-static PROPERTIES FOLDER "plugins/Novae")
diff --git a/plugins/Observability/src/CMakeLists.txt b/plugins/Observability/src/CMakeLists.txt
@@ -30,3 +30,5 @@ TARGET_LINK_LIBRARIES(Observability-static Qt5::Core Qt5::Widgets)
 SET_TARGET_PROPERTIES(Observability-static PROPERTIES OUTPUT_NAME "Observability")
 SET_TARGET_PROPERTIES(Observability-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins Observability-static)
+
+SET_TARGET_PROPERTIES(Observability-static PROPERTIES FOLDER "plugins/Observability")
diff --git a/plugins/Oculars/src/CMakeLists.txt b/plugins/Oculars/src/CMakeLists.txt
@@ -39,3 +39,5 @@ SET_TARGET_PROPERTIES(Oculars-static PROPERTIES OUTPUT_NAME "Oculars")
 TARGET_LINK_LIBRARIES(Oculars-static Qt5::Core Qt5::Widgets)
 SET_TARGET_PROPERTIES(Oculars-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins Oculars-static)
+
+SET_TARGET_PROPERTIES(Oculars-static PROPERTIES FOLDER "plugins/Oculars")
diff --git a/plugins/PointerCoordinates/src/CMakeLists.txt b/plugins/PointerCoordinates/src/CMakeLists.txt
@@ -30,3 +30,6 @@ TARGET_LINK_LIBRARIES(PointerCoordinates-static Qt5::Core Qt5::Widgets)
 SET_TARGET_PROPERTIES(PointerCoordinates-static PROPERTIES OUTPUT_NAME "PointerCoordinates")
 SET_TARGET_PROPERTIES(PointerCoordinates-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins PointerCoordinates-static)
+
+SET_TARGET_PROPERTIES(PointerCoordinates-static PROPERTIES FOLDER "plugins/PointerCoordinates")
+
diff --git a/plugins/Pulsars/src/CMakeLists.txt b/plugins/Pulsars/src/CMakeLists.txt
@@ -30,3 +30,5 @@ TARGET_LINK_LIBRARIES(Pulsars-static Qt5::Core Qt5::Network Qt5::Widgets)
 SET_TARGET_PROPERTIES(Pulsars-static PROPERTIES OUTPUT_NAME "Pulsars")
 SET_TARGET_PROPERTIES(Pulsars-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins Pulsars-static)
+
+SET_TARGET_PROPERTIES(Pulsars-static PROPERTIES FOLDER "plugins/Pulsars")
diff --git a/plugins/Quasars/src/CMakeLists.txt b/plugins/Quasars/src/CMakeLists.txt
@@ -30,3 +30,5 @@ TARGET_LINK_LIBRARIES(Quasars-static Qt5::Core Qt5::Network Qt5::Widgets)
 SET_TARGET_PROPERTIES(Quasars-static PROPERTIES OUTPUT_NAME "Quasars")
 SET_TARGET_PROPERTIES(Quasars-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins Quasars-static)
+
+SET_TARGET_PROPERTIES(Quasars-static PROPERTIES FOLDER "plugins/Quasars")
diff --git a/plugins/RemoteControl/CMakeLists.txt b/plugins/RemoteControl/CMakeLists.txt
@@ -20,6 +20,8 @@ if(PYTHON_EXECUTABLE)
 		)
 
 	add_dependencies(RemoteControl-update-translationdata generate-pot-stellarium-remotecontrol-js)
+
+    SET_TARGET_PROPERTIES(RemoteControl-update-translationdata PROPERTIES FOLDER "plugins/RemoteControl/util")
 endif()
 
 IF(APPLE)

diff --git a/plugins/RemoteControl/src/CMakeLists.txt b/plugins/RemoteControl/src/CMakeLists.txt
@@ -75,3 +75,5 @@ TARGET_LINK_LIBRARIES(RemoteControl-static Qt5::Core Qt5::Network Qt5::Widgets)
 SET_TARGET_PROPERTIES(RemoteControl-static PROPERTIES OUTPUT_NAME "RemoteControl")
 SET_TARGET_PROPERTIES(RemoteControl-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins RemoteControl-static)
+
+SET_TARGET_PROPERTIES(RemoteControl-static PROPERTIES FOLDER "plugins/RemoteControl")
diff --git a/plugins/RemoteSync/src/CMakeLists.txt b/plugins/RemoteSync/src/CMakeLists.txt
@@ -38,3 +38,5 @@ TARGET_LINK_LIBRARIES(RemoteSync-static Qt5::Core Qt5::Network Qt5::Widgets)
 SET_TARGET_PROPERTIES(RemoteSync-static PROPERTIES OUTPUT_NAME "RemoteSync")
 SET_TARGET_PROPERTIES(RemoteSync-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins RemoteSync-static)
+
+SET_TARGET_PROPERTIES(RemoteSync-static PROPERTIES FOLDER "plugins/RemoteSync")
diff --git a/plugins/Satellites/src/CMakeLists.txt b/plugins/Satellites/src/CMakeLists.txt
@@ -63,3 +63,5 @@ ELSE()
      SET_TARGET_PROPERTIES(Satellites-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN -Wno-unused-parameter")
 ENDIF()
 ADD_DEPENDENCIES(AllStaticPlugins Satellites-static)
+
+SET_TARGET_PROPERTIES(Satellites-static PROPERTIES FOLDER "plugins/Satellites")
diff --git a/plugins/Scenery3d/src/CMakeLists.txt b/plugins/Scenery3d/src/CMakeLists.txt
@@ -64,3 +64,5 @@ TARGET_LINK_LIBRARIES(Scenery3d-static Qt5::Core Qt5::Concurrent Qt5::Gui ${STEL
 SET_TARGET_PROPERTIES(Scenery3d-static PROPERTIES OUTPUT_NAME "Scenery3d")
 SET_TARGET_PROPERTIES(Scenery3d-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins Scenery3d-static)
+
+SET_TARGET_PROPERTIES(Scenery3d-static PROPERTIES FOLDER "plugins/Scenery3d")
diff --git a/plugins/SimpleDrawLine/src/CMakeLists.txt b/plugins/SimpleDrawLine/src/CMakeLists.txt
@@ -36,3 +36,5 @@ ELSE()
      SET_TARGET_PROPERTIES(SimpleDrawLine-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
      ADD_DEPENDENCIES(AllStaticPlugins SimpleDrawLine-static)
 ENDIF()
+
+SET_TARGET_PROPERTIES(SimpleDrawLine-static PROPERTIES FOLDER "plugins/SimpleDrawLine")
diff --git a/plugins/SolarSystemEditor/src/CMakeLists.txt b/plugins/SolarSystemEditor/src/CMakeLists.txt
@@ -33,3 +33,5 @@ TARGET_LINK_LIBRARIES(SolarSystemEditor-static Qt5::Core Qt5::Network Qt5::Widge
 SET_TARGET_PROPERTIES(SolarSystemEditor-static PROPERTIES OUTPUT_NAME "SolarSystemEditor")
 SET_TARGET_PROPERTIES(SolarSystemEditor-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins SolarSystemEditor-static)
+
+SET_TARGET_PROPERTIES(SolarSystemEditor-static PROPERTIES FOLDER "plugins/SolarSystemEditor")
diff --git a/plugins/Supernovae/src/CMakeLists.txt b/plugins/Supernovae/src/CMakeLists.txt
@@ -30,3 +30,6 @@ TARGET_LINK_LIBRARIES(Supernovae-static Qt5::Core Qt5::Network Qt5::Widgets)
 SET_TARGET_PROPERTIES(Supernovae-static PROPERTIES OUTPUT_NAME "Supernovae")
 SET_TARGET_PROPERTIES(Supernovae-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins Supernovae-static)
+
+SET_TARGET_PROPERTIES(Supernovae-static PROPERTIES FOLDER "plugins/Supernovae")
+
diff --git a/plugins/TelescopeControl/src/CMakeLists.txt b/plugins/TelescopeControl/src/CMakeLists.txt
@@ -36,3 +36,4 @@ TARGET_LINK_LIBRARIES(TelescopeControl-static
 SET_TARGET_PROPERTIES(TelescopeControl-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins TelescopeControl-static)
 
+SET_TARGET_PROPERTIES(TelescopeControl-static PROPERTIES FOLDER "plugins/TelescopeControl")
diff --git a/plugins/TelescopeControl/src/INDI/CMakeLists.txt b/plugins/TelescopeControl/src/INDI/CMakeLists.txt
@@ -30,3 +30,5 @@ target_include_directories(TelescopeControl_INDI INTERFACE ${CMAKE_CURRENT_SOURC
 IF(ENABLE_TESTING)
     add_subdirectory(test)
 ENDIF(ENABLE_TESTING)
+
+SET_TARGET_PROPERTIES(TelescopeControl_INDI PROPERTIES FOLDER "plugins/TelescopeControl")
diff --git a/plugins/TelescopeControl/src/INDI/test/CMakeLists.txt b/plugins/TelescopeControl/src/INDI/test/CMakeLists.txt
@@ -6,11 +6,14 @@ find_package(Qt5Test)
 add_executable(testTelescopeControl_INDI testTelescopeControl_INDI.cpp testTelescopeControl_INDI.hpp)
 target_link_libraries(testTelescopeControl_INDI Qt5::Test TelescopeControl_INDI stelMain)
 add_test(testTelescopeControl_INDI testTelescopeControl_INDI)
+SET_TARGET_PROPERTIES(testTelescopeControl_INDI PROPERTIES FOLDER "plugins/TelescopeControl/test")
 
 add_executable(testINDIConnection testINDIConnection.cpp testINDIConnection.hpp)
 target_link_libraries(testINDIConnection Qt5::Test TelescopeControl_INDI stelMain)
 add_test(testINDIConnection testINDIConnection)
+SET_TARGET_PROPERTIES(testINDIConnection PROPERTIES FOLDER "plugins/TelescopeControl/test")
 
 add_executable(testTelescopeClientINDI testTelescopeClientINDI.cpp testTelescopeClientINDI.hpp)
 target_link_libraries(testTelescopeClientINDI Qt5::Test TelescopeControl_INDI stelMain)
 add_test(testTelescopeClientINDI testTelescopeClientINDI)
+SET_TARGET_PROPERTIES(testTelescopeClientINDI PROPERTIES FOLDER "plugins/TelescopeControl/test")
diff --git a/plugins/TelescopeControl/src/Lx200/CMakeLists.txt b/plugins/TelescopeControl/src/Lx200/CMakeLists.txt
@@ -16,3 +16,5 @@ target_link_libraries(TelescopeControl_Lx200
     Qt5::Gui
     TelescopeControl_common
     )
+
+SET_TARGET_PROPERTIES(TelescopeControl_Lx200 PROPERTIES FOLDER "plugins/TelescopeControl")
diff --git a/plugins/TelescopeControl/src/NexStar/CMakeLists.txt b/plugins/TelescopeControl/src/NexStar/CMakeLists.txt
@@ -16,3 +16,5 @@ target_link_libraries(TelescopeControl_NexStar
     Qt5::Gui
     TelescopeControl_common
     )
+
+SET_TARGET_PROPERTIES(TelescopeControl_NexStar PROPERTIES FOLDER "plugins/TelescopeControl")
diff --git a/plugins/TelescopeControl/src/Rts2/CMakeLists.txt b/plugins/TelescopeControl/src/Rts2/CMakeLists.txt
@@ -12,3 +12,5 @@ target_link_libraries(TelescopeControl_Rts2
     Qt5::Gui
     TelescopeControl_common
     )
+
+SET_TARGET_PROPERTIES(TelescopeControl_Rts2 PROPERTIES FOLDER "plugins/TelescopeControl")
diff --git a/plugins/TelescopeControl/src/common/CMakeLists.txt b/plugins/TelescopeControl/src/common/CMakeLists.txt
@@ -22,3 +22,5 @@ target_link_libraries(TelescopeControl_common
     Qt5::Gui
     Qt5::Widgets
     )
+
+SET_TARGET_PROPERTIES(TelescopeControl_common PROPERTIES FOLDER "plugins/TelescopeControl")
diff --git a/plugins/TelescopeControl/src/gui/CMakeLists.txt b/plugins/TelescopeControl/src/gui/CMakeLists.txt
@@ -24,3 +24,5 @@ target_link_libraries(TelescopeControl_gui
     TelescopeControl_common
     TelescopeControl_INDI
     )
+
+SET_TARGET_PROPERTIES(TelescopeControl_gui PROPERTIES FOLDER "plugins/TelescopeControl")
diff --git a/plugins/TextUserInterface/src/CMakeLists.txt b/plugins/TextUserInterface/src/CMakeLists.txt
@@ -35,3 +35,5 @@ TARGET_LINK_LIBRARIES(TextUserInterface-static Qt5::Core Qt5::Widgets)
 SET_TARGET_PROPERTIES(TextUserInterface-static PROPERTIES OUTPUT_NAME "TextUserInterface")
 SET_TARGET_PROPERTIES(TextUserInterface-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 ADD_DEPENDENCIES(AllStaticPlugins TextUserInterface-static)
+
+SET_TARGET_PROPERTIES(TextUserInterface-static PROPERTIES FOLDER "plugins/TextUserInterface")
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
@@ -21,6 +21,7 @@
 #   anyway.)
 
 ADD_CUSTOM_TARGET(translations)
+SET_TARGET_PROPERTIES(translations PROPERTIES FOLDER "po")
 
 IF(NOT MSVC)
      # These packages are now used only to generate .pot and .po files
@@ -117,6 +118,7 @@ MACRO(GETTEXT_CREATE_TRANSLATIONS _domain _firstLang)
      # "translations" targets.
      ADD_CUSTOM_TARGET(translations-${_domain} ${_addToAll} DEPENDS ${_gmoFiles})
      ADD_DEPENDENCIES(translations translations-${_domain})
+    SET_TARGET_PROPERTIES(translations-${_domain} PROPERTIES FOLDER "po")
 
 ENDMACRO(GETTEXT_CREATE_TRANSLATIONS )
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -508,7 +508,10 @@ IF(WIN32)
         "
      )
 ENDIF()
-
+
+SET_TARGET_PROPERTIES(stelMain PROPERTIES FOLDER "src/core")
+SET_TARGET_PROPERTIES(stellarium PROPERTIES FOLDER "src")
+
 #############################################################################################
 ################################## Build unit tests #########################################
 #############################################################################################
@@ -519,6 +522,7 @@ IF(ENABLE_TESTING)
 
     # Custom target used to build all tests at once
     ADD_CUSTOM_TARGET(buildTests)
+    SET_TARGET_PROPERTIES(buildTests PROPERTIES FOLDER "src/tests")
 
     SET(tests_testDates_SRCS
         tests/testDates.hpp
@@ -530,6 +534,7 @@ IF(ENABLE_TESTING)
     TARGET_LINK_LIBRARIES(testDates ${TESTS_LIBRARIES})
     ADD_DEPENDENCIES(buildTests testDates)
     ADD_TEST(testDates testDates)
+    SET_TARGET_PROPERTIES(testDates PROPERTIES FOLDER "src/tests")
 
     SET(tests_testStelFileMgr_SRCS
         tests/testStelFileMgr.hpp
@@ -539,6 +544,7 @@ IF(ENABLE_TESTING)
     TARGET_LINK_LIBRARIES(testStelFileMgr ${TESTS_LIBRARIES})
     ADD_DEPENDENCIES(buildTests testStelFileMgr)
     ADD_TEST(testStelFileMgr testStelFileMgr)
+    SET_TARGET_PROPERTIES(testStelFileMgr PROPERTIES FOLDER "src/tests")
 
     SET(tests_testStelSphereGeometry_SRCS
         tests/testStelSphereGeometry.hpp
@@ -548,6 +554,7 @@ IF(ENABLE_TESTING)
     TARGET_LINK_LIBRARIES(testStelSphereGeometry ${TESTS_LIBRARIES} glues_stel)
     ADD_DEPENDENCIES(buildTests testStelSphereGeometry)
     ADD_TEST(testStelSphereGeometry testStelSphereGeometry)
+    SET_TARGET_PROPERTIES(testStelSphereGeometry PROPERTIES FOLDER "src/tests")
 
     SET(tests_testStelSphericalIndex_SRCS
         tests/testStelSphericalIndex.hpp
@@ -557,6 +564,7 @@ IF(ENABLE_TESTING)
     TARGET_LINK_LIBRARIES(testStelSphericalIndex ${TESTS_LIBRARIES})
     ADD_DEPENDENCIES(buildTests testStelSphericalIndex)
     ADD_TEST(testStelSphericalIndex testStelSphericalIndex)
+    SET_TARGET_PROPERTIES(testStelSphericalIndex PROPERTIES FOLDER "src/tests")
 
     SET(tests_testStelJsonParser_SRCS
         tests/testStelJsonParser.hpp
@@ -566,6 +574,7 @@ IF(ENABLE_TESTING)
     TARGET_LINK_LIBRARIES(testStelJsonParser ${TESTS_LIBRARIES})
     ADD_DEPENDENCIES(buildTests testStelJsonParser)
     ADD_TEST(testStelJsonParser testStelJsonParser)
+    SET_TARGET_PROPERTIES(testStelJsonParser PROPERTIES FOLDER "src/tests")
 
     SET(tests_testStelVertexArray_SRCS
         tests/testStelVertexArray.hpp
@@ -575,6 +584,7 @@ IF(ENABLE_TESTING)
     TARGET_LINK_LIBRARIES(testStelVertexArray ${TESTS_LIBRARIES})
     ADD_DEPENDENCIES(buildTests testStelVertexArray)
     ADD_TEST(testStelVertexArray testStelVertexArray)
+    SET_TARGET_PROPERTIES(testStelVertexArray PROPERTIES FOLDER "src/tests")
 
     SET(tests_testDeltaT_SRCS
         tests/testDeltaT.hpp
@@ -584,6 +594,7 @@ IF(ENABLE_TESTING)
     TARGET_LINK_LIBRARIES(testDeltaT ${TESTS_LIBRARIES})
     ADD_DEPENDENCIES(buildTests testDeltaT)
     ADD_TEST(testDeltaT testDeltaT)
+    SET_TARGET_PROPERTIES(testDeltaT PROPERTIES FOLDER "src/tests")
 
     SET(tests_testConversions_SRCS
         tests/testConversions.hpp
@@ -593,6 +604,7 @@ IF(ENABLE_TESTING)
     TARGET_LINK_LIBRARIES(testConversions ${TESTS_LIBRARIES})
     ADD_DEPENDENCIES(buildTests testConversions)
     ADD_TEST(testConversions testConversions)
+    SET_TARGET_PROPERTIES(testConversions PROPERTIES FOLDER "src/tests")
 
     SET(tests_testExtinction_SRCS
         tests/testExtinction.hpp
@@ -602,6 +614,7 @@ IF(ENABLE_TESTING)
     TARGET_LINK_LIBRARIES(testExtinction ${TESTS_LIBRARIES})
     ADD_DEPENDENCIES(buildTests testExtinction)
     ADD_TEST(testExtinction testExtinction)
+    SET_TARGET_PROPERTIES(testExtinction PROPERTIES FOLDER "src/tests")
 
     SET(tests_testRefraction_SRCS
         tests/testRefraction.hpp
@@ -611,6 +624,7 @@ IF(ENABLE_TESTING)
     TARGET_LINK_LIBRARIES(testRefraction ${TESTS_LIBRARIES})
     ADD_DEPENDENCIES(buildTests testRefraction)
     ADD_TEST(testRefraction testRefraction)
+    SET_TARGET_PROPERTIES(testRefraction PROPERTIES FOLDER "src/tests")
 
     SET(tests_testPrecession_SRCS
         tests/testPrecession.hpp
@@ -620,6 +634,7 @@ IF(ENABLE_TESTING)
     TARGET_LINK_LIBRARIES(testPrecession ${TESTS_LIBRARIES})
     ADD_DEPENDENCIES(buildTests testPrecession)
     ADD_TEST(testPrecession testPrecession)
+    SET_TARGET_PROPERTIES(testPrecession PROPERTIES FOLDER "src/tests")
 
     SET(tests_testEphemeris_SRCS
         tests/testEphemeris.hpp
@@ -629,5 +644,6 @@ IF(ENABLE_TESTING)
     TARGET_LINK_LIBRARIES(testEphemeris ${TESTS_LIBRARIES})
     ADD_DEPENDENCIES(buildTests testEphemeris)
     ADD_TEST(testEphemeris testEphemeris)
+    SET_TARGET_PROPERTIES(testEphemeris PROPERTIES FOLDER "src/tests")
 
 ENDIF (ENABLE_TESTING)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,3 +14,4 @@ TARGET_LINK_LIBRARIES(HelloStelModule-static Qt5::Core Qt5::Gui)
		SET_TARGET_PROPERTIES(HelloStelModule-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
		ADD_DEPENDENCIES(AllStaticPlugins HelloStelModule-static)

		SET_TARGET_PROPERTIES(HelloStelModule-static PROPERTIES FOLDER "plugins/HelloStelModule")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -120,3 +120,4 @@ IF(BUILD_STATIC_PLUGINS)
		ADD_DEPENDENCIES(AllStaticPlugins LogBook-static)
		ENDIF()

		SET_TARGET_PROPERTIES(LogBook-static PROPERTIES FOLDER "plugins/LogBook")
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,8 @@ if(PYTHON_EXECUTABLE) @@
     		)
     	add_dependencies(RemoteControl-update-translationdata generate-pot-stellarium-remotecontrol-js)
+        SET_TARGET_PROPERTIES(RemoteControl-update-translationdata PROPERTIES FOLDER "plugins/RemoteControl/util")
     endif()
     IF(APPLE)
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,3 +36,4 @@ TARGET_LINK_LIBRARIES(TelescopeControl-static
		SET_TARGET_PROPERTIES(TelescopeControl-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
		ADD_DEPENDENCIES(AllStaticPlugins TelescopeControl-static)

		SET_TARGET_PROPERTIES(TelescopeControl-static PROPERTIES FOLDER "plugins/TelescopeControl")