move env2c and debug2c into libged.

this fixes a dependency coupling issue where misc had to come before src, but also moving because the tools are not really general. they're highly specific to our existing repo structure and are specifically libged code generators, and only used there so looks like it should make sense to move them into place in libged. giving it a try.
BRL-CAD · Jan 12, 2025 · 585e232 · 585e232
1 parent 626d8fc
commit 585e232
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 13 deletions.
diff --git a/misc/tools/CMakeLists.txt b/misc/tools/CMakeLists.txt
@@ -7,18 +7,6 @@ endfunction(SetTargetFolder)
 # The following are build or utility tools written by BRL-CAD developers
 # specifically for use with our build and maintenance processes
 
-# env2c - Scanner to generate a list of environment variables used by
-# source code
-add_subdirectory(env2c)
-settargetfolder(env2c "Compilation Utilities")
-distclean(${CMAKE_CURRENT_BINARY_DIR}/env2c/Makefile)
-
-# debug2c - Scanner to generate a list of debug variables used by
-# source code
-add_subdirectory(debug2c)
-settargetfolder(debug2c "Compilation Utilities")
-distclean(${CMAKE_CURRENT_BINARY_DIR}/debug2c/Makefile)
-
 # yedit - console editor for Windows to be used as a fallback if
 # there are no other console options present in the environment
 add_subdirectory(yori)

diff --git a/src/libged/debug/CMakeLists.txt b/src/libged/debug/CMakeLists.txt
@@ -7,8 +7,13 @@ include_directories(
   ${GED_INCLUDE_DIRS}
 )
 
-set(DEBUG_CMD_CPP "${CMAKE_CURRENT_BINARY_DIR}/debug_cmd.cpp")
+# debug2c - Scanner to generate a list of debug variables used by
+# source code
+add_subdirectory(debug2c)
+settargetfolder(debug2c "Compilation Utilities")
+distclean(${CMAKE_CURRENT_BINARY_DIR}/debug2c/Makefile)
 
+set(DEBUG_CMD_CPP "${CMAKE_CURRENT_BINARY_DIR}/debug_cmd.cpp")
 add_custom_command(
   OUTPUT ${DEBUG_CMD_CPP}
   COMMAND debug2c ${CMAKE_BINARY_DIR}/cmakefiles.cmake ${DEBUG_CMD_CPP}

diff --git a/misc/tools/debug2c/CMakeLists.txt → src/libged/debug/debug2c/CMakeLists.txt b/misc/tools/debug2c/CMakeLists.txt → src/libged/debug/debug2c/CMakeLists.txt
diff --git a/misc/tools/debug2c/debug2c.cpp → src/libged/debug/debug2c/debug2c.cpp b/misc/tools/debug2c/debug2c.cpp → src/libged/debug/debug2c/debug2c.cpp
diff --git a/src/libged/env/CMakeLists.txt b/src/libged/env/CMakeLists.txt
@@ -7,6 +7,12 @@ include_directories(
   ${GED_INCLUDE_DIRS}
 )
 
+# env2c - Scanner to generate a list of environment variables used by
+# source code
+add_subdirectory(env2c)
+settargetfolder(env2c "Compilation Utilities")
+distclean(${CMAKE_CURRENT_BINARY_DIR}/env2c/Makefile)
+
 set(ENV_CMD_C "${CMAKE_CURRENT_BINARY_DIR}/env_cmd.c")
 add_custom_command(
   OUTPUT ${ENV_CMD_C}

diff --git a/misc/tools/env2c/CMakeLists.txt → src/libged/env/env2c/CMakeLists.txt b/misc/tools/env2c/CMakeLists.txt → src/libged/env/env2c/CMakeLists.txt
diff --git a/misc/tools/env2c/env2c.cpp → src/libged/env/env2c/env2c.cpp b/misc/tools/env2c/env2c.cpp → src/libged/env/env2c/env2c.cpp