build: perform parallel builds of BlocksRuntime

Build both the static and shared variants of the BlocksRuntime.  This is needed
for proper shared linkage to the BlocksRuntime (e.g. when building SourceKit).
Build both variants and install to the appropriate location.

Author: compnerd

CMakeLists.txt

@@ -74,14 +74,12 @@ if(ENABLE_SWIFT)
 
   set(INSTALL_TARGET_DIR "${INSTALL_LIBDIR}/swift/${SWIFT_OS}" CACHE PATH "Path where the libraries will be installed")
   set(INSTALL_DISPATCH_HEADERS_DIR "${INSTALL_LIBDIR}/swift/dispatch" CACHE PATH "Path where the headers will be installed for libdispatch")
-  set(INSTALL_BLOCK_HEADERS_DIR "${INSTALL_LIBDIR}/swift/Block" CACHE PATH "Path where the headers will be installed for the blocks runtime")
   set(INSTALL_OS_HEADERS_DIR "${INSTALL_LIBDIR}/swift/os" CACHE PATH "Path where the os/ headers will be installed")
 endif()
 
 if(NOT ENABLE_SWIFT)
   set(INSTALL_TARGET_DIR "${INSTALL_LIBDIR}" CACHE PATH "Path where the libraries will be installed")
   set(INSTALL_DISPATCH_HEADERS_DIR "include/dispatch" CACHE PATH "Path where the headers will be installed")
-  set(INSTALL_BLOCK_HEADERS_DIR "include" CACHE PATH "Path where the headers will be installed for the blocks runtime")
   set(INSTALL_OS_HEADERS_DIR "include/os" CACHE PATH "Path where the headers will be installed")
 endif()
 
@@ -132,34 +130,82 @@ endif()
 
 option(INSTALL_PRIVATE_HEADERS "installs private headers in the same location as the public ones" OFF)
 
-find_package(BlocksRuntime QUIET)
-if(NOT BlocksRuntime_FOUND)
+if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
   set(BlocksRuntime_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/src/BlocksRuntime)
 
-  add_library(BlocksRuntime
-              STATIC
-                ${PROJECT_SOURCE_DIR}/src/BlocksRuntime/data.c
-                ${PROJECT_SOURCE_DIR}/src/BlocksRuntime/runtime.c)
-  set_target_properties(BlocksRuntime
+  include(ExternalProject)
+  ExternalProject_Add(SharedBlocksRuntime
+                      SOURCE_DIR
+                        ${PROJECT_SOURCE_DIR}/src/BlocksRuntime
+                      CMAKE_ARGS
+                        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+                        -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+                        -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+                        -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
+                        -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+                        -DBUILD_SHARED_LIBS=YES
+                      BUILD_BYPRODUCTS
+                        <BINARY_DIR>/${CMAKE_SHARED_LIBRARY_PREFIX}BlocksRuntime${CMAKE_SHARED_LIBRARY_SUFFIX}
+                        <BINARY_DIR>/${CMAKE_IMPORT_LIBRARY_PREFIX}BlocksRuntime${CMAKE_IMPORT_LIBRARY_SUFFIX}
+                      BUILD_ALWAYS
+                        1)
+  ExternalProject_Add(StaticBlocksRuntime
+                      SOURCE_DIR
+                        ${PROJECT_SOURCE_DIR}/src/BlocksRuntime
+                      CMAKE_ARGS
+                        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+                        -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+                        -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+                        -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
+                        -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+                        -DBUILD_SHARED_LIBS=NO
+                      BUILD_BYPRODUCTS
+                        <BINARY_DIR>/${CMAKE_SHARED_LIBRARY_PREFIX}BlocksRuntime${CMAKE_SHARED_LIBRARY_SUFFIX}
+                        <BINARY_DIR>/${CMAKE_IMPORT_LIBRARY_PREFIX}BlocksRuntime${CMAKE_IMPORT_LIBRARY_SUFFIX}
+                      BUILD_ALWAYS
+                        1)
+
+  ExternalProject_Get_Property(SharedBlocksRuntime binary_dir)
+  add_library(BlocksRuntime::BlocksRuntime SHARED IMPORTED)
+  set_target_properties(BlocksRuntime::BlocksRuntime
                         PROPERTIES
-                          POSITION_INDEPENDENT_CODE TRUE)
-  if(HAVE_OBJC AND CMAKE_DL_LIBS)
-    set_target_properties(BlocksRuntime
-                          PROPERTIES
-                            INTERFACE_LINK_LIBRARIES ${CMAKE_DL_LIBS})
-  endif()
-
-  add_library(BlocksRuntime::BlocksRuntime ALIAS BlocksRuntime)
+                          INTERFACE_INCLUDE_DIRECTORIES
+                            ${PROJECT_SOURCE_DIR}/src/BlocksRuntime
+                          IMPORTED_LOCATION
+                            ${binary_dir}/${CMAKE_SHARED_LIBRARY_PREFIX}BlocksRuntime${CMAKE_SHARED_LIBRARY_SUFFIX}
+                          IMPORTED_IMPLIB
+                            ${binary_dir}/${CMAKE_IMPORT_LIBRARY_PREFIX}BlocksRuntime${CMAKE_IMPORT_LIBRARY_SUFFIX})
 
-  install(FILES
-            ${PROJECT_SOURCE_DIR}/src/BlocksRuntime/Block.h
-          DESTINATION
-            "${INSTALL_BLOCK_HEADERS_DIR}")
-  if(INSTALL_PRIVATE_HEADERS)
+  if(ENABLE_SWIFT)
+    install(FILES
+              ${PROJECT_SOURCE_DIR}/src/BlocksRuntime/Block.h
+            DESTINATION
+              ${SWIFT_LIBDIR}/swift/Block)
+    if(INSTALL_PRIVATE_HEADERS)
+      install(FILES
+                ${PROJECT_SOURCE_DIR}/src/BlocksRuntime/Block_private.h
+              DESTINATION
+                ${SWIFT_LIBDIR}/swift/Block)
+    endif()
+    install(TARGETS
+              BlocksRuntime::BlocksRuntime
+            DESTINATION
+              ${SWIFT_LIBDIR}/swift/${SWIFT_OS}/${SWIFT_HOST_ARCH})
+  else()
     install(FILES
-              ${PROJECT_SOURCE_DIR}/src/BlocksRuntime/Block_private.h
+              ${PROJECT_SOURCE_DIR}/src/BlocksRuntime/Block.h
+            DESTINATION
+              ${CMAKE_INSTALL_INCLUDEDIR})
+    if(INSTALL_PRIVATE_HEADERS)
+      install(FILES
+                ${PROJECT_SOURCE_DIR}/src/BlocksRuntime/Block_private.h
+              DESTINATION
+                ${CMAKE_INSTALL_INCLUDEDIR})
+    endif()
+    install(TARGETS
+              BlocksRuntime::BlocksRuntime
             DESTINATION
-              "${INSTALL_BLOCK_HEADERS_DIR}")
+              ${CMAKE_INSTALL_LIBDIR})
   endif()
 endif()
 

src/BlocksRuntime/CMakeLists.txt

@@ -0,0 +1,51 @@
+
+cmake_minimum_required(VERSION 3.4.3)
+project(BlocksRuntime
+        LANGUAGES C)
+
+include(CheckIncludeFiles)
+include(GNUInstallDirs)
+
+if(CMAKE_C_SIMULATE_ID STREQUAL MSVC)
+  # clang-cl interprets paths starting with /U as macro undefines, so we need to
+  # put a -- before the input file path to force it to be treated as a path.
+  string(REPLACE "-c <SOURCE>" "-c -- <SOURCE>" CMAKE_C_COMPILE_OBJECT "${CMAKE_C_COMPILE_OBJECT}")
+endif()
+
+set(CMAKE_C_STANDARD 11)
+set(CMAKE_C_STANDARD_REQUIRED YES)
+
+set(CMAKE_C_VISIBILITY_PRESET hidden)
+set(CMAKE_C_VISIBILITY_INLINES_HIDDEN YES)
+
+check_include_files("objc/objc-internal.h" HAVE_OBJC)
+
+option(INSTALL_PRIVATE_HEADERS "install private headers in the same location as the public ones" NO)
+
+add_library(BlocksRuntime
+            ${PROJECT_SOURCE_DIR}/data.c
+            ${PROJECT_SOURCE_DIR}/runtime.c)
+set_target_properties(BlocksRuntime
+                      PROPERTIES
+                        POSITION_INDEPENDENT_CODE TRUE)
+if(HAVE_OBJC AND CMAKE_DL_LIBS)
+  target_link_libraries(BlocksRuntime
+                        PUBLIC
+                          ${CMAKE_DL_LIBS})
+endif()
+
+install(FILES
+          ${PROJECT_SOURCE_DIR}/Block.h
+        DESTINATION
+          ${CMAKE_INSTALL_INCLUDEDIR})
+if(INSTALL_PRIVATE_HEADERS)
+  install(FILES
+            ${PROJECT_SOURCE_DIR}/Block_private.h
+          DESTINATION
+            ${CMAKE_INSTALL_INCLUDEDIR})
+endif()
+install(TARGETS
+          BlocksRuntime
+        DESTINATION
+          ${CMAKE_INSTALL_LIBDIR})
+