Move Legacy Generator CMake code

Move the code responsible for building the legacy CMake generator into a subdirectory.
jschwe · Aug 8, 2023 · 1752605 · 1752605
1 parent b092ad7
commit 1752605
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 48 deletions.
diff --git a/cmake/Corrosion.cmake b/cmake/Corrosion.cmake
@@ -570,61 +570,21 @@ endif()
 
 if(CORROSION_NATIVE_TOOLING)
     if (NOT TARGET Corrosion::Generator )
-        set(generator_destination "${CMAKE_CURRENT_BINARY_DIR}/corrosion/legacy_generator")
-        message(STATUS "Building CMake Generator for Corrosion - This may take a while")
-        set(generator_build_quiet "")
-        # Using cargo install has the advantage of caching the build in the user .cargo directory,
-        # so likely the rebuild will be very cheap even after deleting the build directory.
-        execute_process(
-                COMMAND ${CMAKE_COMMAND}
-                    -E env
-                        # If the Generator is built at configure of a project (instead of being pre-installed)
-                        # We don't want environment variables like `RUSTFLAGS` affecting the Generator build.
-                        --unset=RUSTFLAGS
-                        "CARGO_BUILD_RUSTC=${RUSTC_EXECUTABLE}"
-                    "${CARGO_EXECUTABLE}" install
-                        --path "."
-                        --root "${generator_destination}"
-                        --locked
-                        ${_CORROSION_QUIET_OUTPUT_FLAG}
-                WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/../generator"
-                RESULT_VARIABLE generator_build_failed
-        )
-        if(generator_build_failed)
-            message(FATAL_ERROR "Building CMake Generator for Corrosion - failed")
-        else()
-            message(STATUS "Building CMake Generator for Corrosion - done")
-        endif()
-        set(host_executable_suffix "")
-        if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
-            set(host_executable_suffix ".exe")
-        endif()
-        set(_CORROSION_GENERATOR_EXE "${generator_destination}/bin/corrosion-generator${host_executable_suffix}")
-        if (CORROSION_DEV_MODE)
-            # If you're developing Corrosion, you want to make sure to re-configure whenever the
-            # generator changes.
-            file(GLOB_RECURSE _RUST_FILES CONFIGURE_DEPENDS generator/src/*.rs)
-            file(GLOB _CARGO_FILES CONFIGURE_DEPENDS generator/Cargo.*)
-            set_property(
-                DIRECTORY APPEND
-                PROPERTY CMAKE_CONFIGURE_DEPENDS
-                    ${_RUST_FILES} ${_CARGO_FILES})
-        endif()
+        add_subdirectory(generator)
     else()
         get_property(
-            _CORROSION_GENERATOR_EXE
-            TARGET Corrosion::Generator PROPERTY IMPORTED_LOCATION
+                _CORROSION_GENERATOR_EXE
+                TARGET Corrosion::Generator PROPERTY IMPORTED_LOCATION
         )
     endif()
-
     set(
-        _CORROSION_GENERATOR
-        ${CMAKE_COMMAND} -E env
+_CORROSION_GENERATOR
+            ${CMAKE_COMMAND} -E env
             CARGO_BUILD_RUSTC=${RUSTC_EXECUTABLE}
             ${_CORROSION_GENERATOR_EXE}
-                --cargo ${CARGO_EXECUTABLE}
-                ${_CORROSION_VERBOSE_OUTPUT_FLAG}
-        CACHE INTERNAL "corrosion-generator runner"
+            --cargo ${CARGO_EXECUTABLE}
+            ${_CORROSION_VERBOSE_OUTPUT_FLAG}
+            CACHE INTERNAL "corrosion-generator runner"
     )
 endif()
 

diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
@@ -0,0 +1,46 @@
+message(STATUS "Building CMake Generator for Corrosion - This may take a while")
+
+set(generator_destination "${CMAKE_CURRENT_BINARY_DIR}/legacy_generator_src")
+set(generator_destination "${CMAKE_CURRENT_BINARY_DIR}/legacy_generator")
+set(generator_build_quiet "")
+
+# Using cargo install has the advantage of caching the build in the user .cargo directory,
+# so likely the rebuild will be very cheap even after deleting the build directory.
+execute_process(
+        COMMAND ${CMAKE_COMMAND}
+        -E env
+        # If the Generator is built at configure of a project (instead of being pre-installed)
+        # We don't want environment variables like `RUSTFLAGS` affecting the Generator build.
+        --unset=RUSTFLAGS
+        "CARGO_BUILD_RUSTC=${RUSTC_EXECUTABLE}"
+        "${CARGO_EXECUTABLE}" install
+        --path "."
+        --root "${generator_destination}"
+        --locked
+        ${_CORROSION_QUIET_OUTPUT_FLAG}
+        WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
+        RESULT_VARIABLE generator_build_failed
+)
+if(generator_build_failed)
+    message(FATAL_ERROR "Building CMake Generator for Corrosion - failed")
+else()
+    message(STATUS "Building CMake Generator for Corrosion - done")
+endif()
+set(host_executable_suffix "")
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+    set(host_executable_suffix ".exe")
+endif()
+set(_CORROSION_GENERATOR_EXE
+        "${generator_destination}/bin/corrosion-generator${host_executable_suffix}"
+        PARENT_SCOPE)
+if (CORROSION_DEV_MODE)
+    # If you're developing Corrosion, you want to make sure to re-configure whenever the
+    # generator changes.
+    file(GLOB_RECURSE _RUST_FILES CONFIGURE_DEPENDS generator/src/*.rs)
+    file(GLOB _CARGO_FILES CONFIGURE_DEPENDS generator/Cargo.*)
+    set_property(
+            DIRECTORY APPEND
+            PROPERTY CMAKE_CONFIGURE_DEPENDS
+            ${_RUST_FILES} ${_CARGO_FILES})
+endif()
+