build: update for cmark build revamp and split the build

Extricate cmark from the unified build system. This is preparatory work
to support building CMark GFM with dynamic linkage for sharing it across
swift-markdown and the compiler. It also simplifies the build logic for
the unified build.

Author: compnerd

CMakeLists.txt

@@ -780,11 +780,15 @@ if (CMAKE_Swift_COMPILER)
 else()
   message(STATUS "Swift Compiler (None).")
 endif()
-if(SWIFT_PATH_TO_CMARK_BUILD)
-  execute_process(COMMAND ${SWIFT_PATH_TO_CMARK_BUILD}/src/cmark --version
-    OUTPUT_VARIABLE _CMARK_VERSION
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  message(STATUS "CMark Version: ${_CMARK_VERSION}")
+if(SWIFT_INCLUDE_TOOLS)
+  if(SWIFT_PATH_TO_CMARK_BUILD)
+    execute_process(COMMAND ${SWIFT_PATH_TO_CMARK_BUILD}/src/cmark --version
+      OUTPUT_VARIABLE _CMARK_VERSION
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+    message(STATUS "CMark Version: ${_CMARK_VERSION}")
+  else()
+    find_package(cmark-gfm CONFIG REQUIRED)
+  endif()
 endif()
 message(STATUS "")
 

cmake/modules/SwiftSharedCMakeConfig.cmake

@@ -276,24 +276,6 @@ macro(swift_common_unified_build_config product)
   include_directories(${LLVM_EXTERNAL_CLANG_SOURCE_DIR}/include
     ${CMAKE_BINARY_DIR}/tools/clang/include)
 
-  # If cmark was checked out into tools/cmark, expect to build it as
-  # part of the unified build.
-  if(EXISTS "${LLVM_EXTERNAL_CMARK_SOURCE_DIR}")
-    set(${product}_PATH_TO_CMARK_SOURCE "${LLVM_EXTERNAL_CMARK_SOURCE_DIR}")
-    set(${product}_PATH_TO_CMARK_BUILD "${CMAKE_BINARY_DIR}/tools/cmark")
-    set(${product}_CMARK_LIBRARY_DIR "${CMAKE_BINARY_DIR}/lib")
-
-    get_filename_component(CMARK_MAIN_SRC_DIR "${${product}_PATH_TO_CMARK_SOURCE}"
-      ABSOLUTE)
-    get_filename_component(PATH_TO_CMARK_BUILD "${${product}_PATH_TO_CMARK_BUILD}"
-      ABSOLUTE)
-    get_filename_component(CMARK_LIBRARY_DIR "${${product}_CMARK_LIBRARY_DIR}"
-      ABSOLUTE)
-
-    include_directories(${PATH_TO_CMARK_BUILD}/src
-      ${CMARK_MAIN_SRC_DIR}/src/include)
-  endif()
-
   include(AddSwiftTableGen) # This imports TableGen from LLVM.
 endmacro()
 

lib/Markup/CMakeLists.txt

@@ -3,8 +3,4 @@ add_swift_host_library(swiftMarkup STATIC
   LineList.cpp
   Markup.cpp)
 target_link_libraries(swiftMarkup PRIVATE
-  libcmark-gfm_static)
-target_compile_definitions(swiftMarkup
-                           PRIVATE
-                           CMARK_GFM_STATIC_DEFINE)
-
+  libcmark-gfm)

utils/build.ps1

@@ -842,6 +842,22 @@ function Build-WiXProject() {
   Invoke-Program $msbuild @MSBuildArgs
 }
 
+function Build-CMark($Arch) {
+  $ArchName = $Arch.ShortName
+
+  Build-CMakeProject `
+    -Src $SourceCache\cmark `
+    -Bin "$($Arch.BinaryCache)\cmark-gfm-0.29.0.gfm.13" `
+    -InstallTo "$LibraryRoot\cmark-0.29.0.gfm.13\usr" `
+    -Arch $Arch `
+    -BuildTargets default `
+    -Defines @{
+      BUILD_SHARED_LIBS = "NO";
+      BUILD_TESTING = "NO";
+      CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP = "YES";
+    }
+}
+
 function Build-BuildTools($Arch) {
   Build-CMakeProject `
     -Src $SourceCache\llvm-project\llvm `
@@ -873,6 +889,7 @@ function Build-BuildTools($Arch) {
       SWIFT_INCLUDE_APINOTES = "NO";
       SWIFT_INCLUDE_DOCS = "NO";
       SWIFT_INCLUDE_TESTS = "NO";
+      "cmark-gfm_DIR" = "$($HostArch.BinaryCache)\cmark-gfm-0.29.0.gfm.13";
     }
 }
 
@@ -953,6 +970,7 @@ function Build-Compilers() {
         SWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE = "$SourceCache\swift-syntax";
         SWIFT_PATH_TO_STRING_PROCESSING_SOURCE = "$SourceCache\swift-experimental-string-processing";
         SWIFT_PATH_TO_SWIFT_SDK = (Get-PinnedToolchainSDK);
+        "cmark-gfm_DIR" = "$($HostArch.BinaryCache)\cmark-gfm-0.29.0.gfm.13";
       })
   }
 }
@@ -1736,6 +1754,7 @@ if (-not $SkipBuild) {
 }
 
 if (-not $SkipBuild) {
+  Invoke-BuildStep Build-CMark $HostArch
   Invoke-BuildStep Build-BuildTools $HostArch
   Invoke-BuildStep Build-Compilers $HostArch
 }