Merge pull request #482 from pzychotic/cmake-folders

Better project structure for IDEs
DescentDevelopers · Jul 4, 2024 · 9263055 · 9263055
2 parents ee9e642 + 12ec7c5
commit 9263055
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,6 +26,8 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
 if(FORCE_COLORED_OUTPUT)
   if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.24)
     set(CMAKE_COLOR_DIAGNOSTICS ON)

diff --git a/Descent3/tests/CMakeLists.txt b/Descent3/tests/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(CMAKE_FOLDER "tests")
+
 add_executable(
   porting-tests
   porting-tests.cpp

diff --git a/md5/tests/CMakeLists.txt b/md5/tests/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(CMAKE_FOLDER "tests")
+
 add_executable(
   md5_tests
   ../md5.cpp

diff --git a/misc/tests/CMakeLists.txt b/misc/tests/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(CMAKE_FOLDER "tests")
+
 add_executable(
   misc_tests
   misc_tests.cpp

diff --git a/netcon/CMakeLists.txt b/netcon/CMakeLists.txt
@@ -1,4 +1,6 @@
+set(CMAKE_FOLDER "netcon")
+
 include_directories("includes")
 add_subdirectory(inetfile)
 add_subdirectory(lanclient)
-add_subdirectory(mtclient)
+add_subdirectory(mtclient)
diff --git a/netgames/CMakeLists.txt b/netgames/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(CMAKE_FOLDER "netgames")
+
 include_directories("includes")
 add_subdirectory(dmfc)
 add_subdirectory(anarchy)

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(CMAKE_FOLDER "Scripts")
+set(CMAKE_FOLDER "scripts")
 
 set(CPPS
   $<$<PLATFORM_ID:Darwin,Linux>:

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(CMAKE_FOLDER "tests")
+
 add_executable(
   byteswap_tests
   byteswap_tests.cpp

diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
@@ -1 +1,3 @@
+set(CMAKE_FOLDER "third_party")
+
 add_subdirectory(stb)
Original file line number	Diff line number	Diff line change
		@@ -1 +1,3 @@
		set(CMAKE_FOLDER "third_party")

		add_subdirectory(stb)