Reapply "Move non-sysdep third-party projects after base and compiler"

BUILD_TOPOLOGY.toml

@@ -194,6 +194,7 @@ type = "generic"
 [artifact_groups.third-party-libs]
 description = "Optional third-party libraries (for tests/specific features)"
 type = "generic"
+artifact_group_deps = ["compiler"]
 source_sets = []  # No submodules - uses vendored/in-tree deps
 
 [artifact_groups.base]
@@ -408,7 +409,7 @@ feature_group = "CORE"
 [artifacts.spdlog]
 artifact_group = "third-party-libs"
 type = "target-neutral"
-artifact_deps = []
+artifact_deps = ["amd-llvm"]
 feature_group = "CORE"
 
 # --- Base Infrastructure ---

CMakeLists.txt

@@ -439,9 +439,10 @@ endif()
 
 # Add subdirectories in dependency DAG order (which happens to be semi-alpha:
 # don't be fooled).
-add_subdirectory(third-party)
+add_subdirectory(third-party/sysdeps)
 add_subdirectory(base)
 add_subdirectory(compiler)
+add_subdirectory(third-party)
 add_subdirectory(core)
 add_subdirectory(debug-tools)
 # Note that rocprofiler-register is in base and is what higher level clients

third-party/CMakeLists.txt

@@ -1,3 +1,9 @@
+# Subdirectory load order here is carefully balanced - see usage from the root
+# CMakeLists.txt. Notably this file does *not* include the sysdeps subdirectory,
+# which is expected to be included *first*. This allows for bootstrapping
+# compiler/, so other projects in this directory can use the amd-llvm compiler
+# toolchain if they so wish (most should eventually).
+
 add_custom_target(therock-third-party)
 
 # No-dep third party libraries (alphabetical)
@@ -18,8 +24,10 @@ add_subdirectory(fftw3)
 # frugally-deep depends on eigen, FunctionalPlus and nlohmann-json
 add_subdirectory(frugally-deep)
 
-# spdlog depends on fmt.
-add_subdirectory(spdlog)
+# spdlog depends on fmt and amd-llvm toolchain.
+if(THEROCK_ENABLE_SPDLOG)
+  add_subdirectory(spdlog)
+endif()
 
 # Host math libraries.
 if(THEROCK_ENABLE_HOST_BLAS)
@@ -29,15 +37,6 @@ if(THEROCK_ENABLE_HOST_SUITE_SPARSE)
   add_subdirectory(SuiteSparse)
 endif()
 
-# TODO: Relocate non header-only libraries here (i.e. boost, host-blas).
-if(THEROCK_BUNDLE_SYSDEPS)
-  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    add_subdirectory(sysdeps/linux)
-  elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    add_subdirectory(sysdeps/windows)
-  endif()
-endif()
-
 # gRPC: Static library for RDC (built on-demand when depended upon)
 # See: docs/rfcs/RFC0007-rdc-therock-integration.md
 add_subdirectory(grpc)

third-party/spdlog/CMakeLists.txt

@@ -12,6 +12,8 @@ therock_cmake_subproject_declare(therock-spdlog
   NO_MERGE_COMPILE_COMMANDS
   OUTPUT_ON_FAILURE
   EXTERNAL_SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/source"
+  COMPILER_TOOLCHAIN
+    amd-llvm
   BUILD_DEPS
     therock-fmt
   CMAKE_ARGS

third-party/sysdeps/CMakeLists.txt

@@ -0,0 +1,8 @@
+# TODO: Relocate non header-only libraries here (i.e. boost, host-blas).
+if(THEROCK_BUNDLE_SYSDEPS)
+  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    add_subdirectory(linux)
+  elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    add_subdirectory(windows)
+  endif()
+endif()