fixup! [Runtimes][CMake] Add Findmath.cmake and use it in Differentiation

Signed-off-by: Andrew Sukach <[email protected]>

Author: sookach

Runtimes/Supplemental/CMakeLists.txt

@@ -47,3 +47,15 @@ if(SwiftRuntime_ENABLE_stringprocessing)
     CMAKE_ARGS
       ${COMMON_OPTIONS})
 endif()
+
+
+# Differentiation
+if(SwiftRuntime_ENABLE_differentiation)
+  ExternalProject_Add(Differentiation
+    PREFIX "Differentiation"
+    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Differentiation"
+    INSTALL_DIR "${CMAKE_INSTALL_PREFIX}"
+    INSTALL_COMMAND ""
+    CMAKE_ARGS
+      ${COMMON_OPTIONS})
+endif()

Runtimes/Supplemental/Differentiation/CMakeLists.txt

@@ -1,9 +1,5 @@
 cmake_minimum_required(VERSION 3.29)
 
-set(CMAKE_POSITION_INDEPENDENT_CODE YES)
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake/modules")
-
 if($ENV{BUILD_NUMBER})
   math(EXPR BUILD_NUMBER "$ENV{BUILD_NUMBER} % 65535")
   set(BUILD_NUMBER ".${BUILD_NUMBER}")
@@ -12,6 +8,11 @@ project(SwiftDifferentiation
   LANGUAGES Swift C
   VERSION 6.1.0${BUILD_NUMBER})
 
+set(CMAKE_POSITION_INDEPENDENT_CODE YES)
+set(CMAKE_Swift_LANGUAGE_VERSION 5)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake/modules")
+
 if(NOT PROJECT_IS_TOP_LEVEL)
   message(SEND_ERROR "Swift Differentiation must build as a standalone project")
 endif()
@@ -21,14 +22,18 @@ set(${PROJECT_NAME}_SWIFTC_SOURCE_DIR
   CACHE FILEPATH "Path to the root source directory of the Swift compiler")
 
 find_package(SwiftCore)
-find_package(math)
+find_package(SwiftMath)
 
 include(gyb)
+include(AvailabilityMacros)
+include(CatalystSupport)
+include(EmitSwiftInterface)
+include(ResourceEmbedding)
 
-option(SwiftDifferentiation_ENABLE_VECTOR_TYPES "Enable vector support"
+option(${PROJECT_NAME}_ENABLE_VECTOR_TYPES "Enable vector support"
   ${SwiftCore_ENABLE_VECTOR_TYPES})
 
-option(SwiftDifferentiation_ENABLE_LIBRARY_EVOLUTION "Enable library evolution"
+option(${PROJECT_NAME}_ENABLE_LIBRARY_EVOLUTION "Enable library evolution"
   ${SwiftCore_ENABLE_LIBRARY_EVOLUTION})
 
 add_compile_options(
@@ -66,7 +71,26 @@ add_library(swift_Differentiation
   linker-support/magic-symbols-for-install-name.c)
 
 set_target_properties(swift_Differentiation PROPERTIES
-  Swift_MODULE_NAME _Differentiation
-  Swift_COMPILATION_MODE wholemodule)
+  Swift_MODULE_NAME _Differentiation)
+
+if(APPLE AND BUILD_SHARED_LIBS)
+  target_link_options(swift_Differentiation PRIVATE "SHELL:-Xlinker -headerpad_max_install_names")
+endif()
+
+target_link_libraries(swift_Differentiation PRIVATE swiftCore SwiftMath)
+
+set(${PROJECT_NAME}_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>$<$<BOOL:${Supplemental_INSTALL_NESTED_SUBDIR}>:/${Supplemental_PLATFORM_SUBDIR}/${Supplemental_ARCH_SUBDIR}>" CACHE STRING "")
+set(${PROJECT_NAME}_INSTALL_SWIFTMODULEDIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>$<$<BOOL:${Supplemental_INSTALL_NESTED_SUBDIR}>:/${Supplemental_PLATFORM_SUBDIR}>" CACHE STRING "")
+
+install(TARGETS swift_Differentiation
+  EXPORT SwiftSupplementalTargets
+  COMPONENT SwiftCore_runtime
+  ARCHIVE DESTINATION "${${PROJECT_NAME}_INSTALL_LIBDIR}"
+  LIBRARY DESTINATION "${${PROJECT_NAME}_INSTALL_LIBDIR}"
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+emit_swift_interface(swift_Differentiation)
+install_swift_interface(swift_Differentiation)
 
-target_link_libraries(swift_Differentiation PRIVATE swiftCore math)
+# Configure plist creation for Darwin platforms.
+generate_plist("${CMAKE_PROJECT_NAME}" "${CMAKE_PROJECT_VERSION}" swift_Differentiation)
+embed_manifest(swift_Differentiation)

Runtimes/Supplemental/cmake/modules/Findmath.cmake renamed to Runtimes/Supplemental/cmake/modules/FindSwiftMath.cmake

@@ -1,5 +1,5 @@
 #[=======================================================================[.rst:
-Findmath
+FindSwiftMath
 ------------
 
 Find the Swift `_math` module interface, deferring to mathConfig.cmake when
@@ -23,73 +23,63 @@ Hint Variables
    This only affects Linux and Windows builds.
    Apple builds always use the library provided by the SDK.
 
- ``math_STATIC``
-   Look for the libmath static archive instead of the dynamic library.
-
 Result Variables
 ^^^^^^^^^^^^^^^^
 
-The module may set the following variables if `math_DIR` is not set.
+The module may set the following variables if `SwiftMath_DIR` is not set.
 
- ``math_FOUND``
+ ``SwiftMath_FOUND``
    true if the `_math` module interface (and required library) were found.
 
- ``math_INCLUDE_DIR``
+ ``SwiftMath_INCLUDE_DIR``
    The directory containing the `_math.swiftinterface` file
 
- ``math_LIBRARIES`` OR ``math_IMPLIB``
+ ``SwiftMath_LIBRARIES`` OR ``SwiftMath_IMPLIB``
    the libraries to be linked
 
 #]=======================================================================]
 
 # If the math_DIR is specified, look there instead. The cmake-generated
 # config file is more accurate, but requires that the SDK has one available.
-if(math_DIR)
-  if(math_FIND_REQUIRED)
+if(SwiftMath_DIR)
+  if(SwiftMath_FIND_REQUIRED)
     list(APPEND args REQUIRED)
   endif()
-  if(math_FIND_QUIETLY)
+  if(SwiftMath_FIND_QUIETLY)
     list(APPEND args QUIET)
   endif()
-  find_package(math NO_MODULE ${args})
+  find_package(SwiftMath NO_MODULE ${args})
   return()
 endif()
 
 include(FindPackageHandleStandardArgs)
 include(PlatformInfo)
 
 if(APPLE)
-  find_path(math_INCLUDE_DIR
+  find_path(SwiftMath_INCLUDE_DIR
     NAMES _math.swiftmodule
     PATHS ${CMAKE_OSX_SYSROOT}/usr/lib/swift)
-  find_path(math_IMPLIB
+  find_path(SwiftMath_IMPLIB
     NAMES libm.tbd
     PATHS usr/lib)
-  add_library(math SHARED IMPORTED GLOBAL)
-  set_target_properties(math PROPERTIES
-    IMPORTED_IMPLIB ${math_IMPLIB}
-    INTERFACE_INCLUDE_DIRECTORIES ${math_INCLUDE_DIR})
-  find_package_handle_standard_args(math DEFAULT_MSG
-    math_IMPLIB math_INCLUDE_DIR)
+  add_library(SwiftMath SHARED IMPORTED GLOBAL)
+  set_target_properties(SwiftMath PROPERTIES
+    IMPORTED_IMPLIB ${SwiftMath_IMPLIB}
+    INTERFACE_INCLUDE_DIRECTORIES ${SwiftMath_INCLUDE_DIR})
+  find_package_handle_standard_args(SwiftMath DEFAULT_MSG
+    SwiftMath_IMPLIB SwiftMath_INCLUDE_DIR)
 elseif(LINUX)
-  find_path(math_INCLUDE_DIR
+  find_path(SwiftMath_INCLUDE_DIR
     glibc.modulemap
     PATHS ${Swift_SDKROOT}/usr/lib/swift/linux/${SwiftSupplemental_ARCH_SUBDIR})
-  find_path(math_GLIBC_DIR
+  find_path(SwiftMath_GLIBC_DIR
     Glibc.swiftmodule
     PATHS ${Swift_SDKROOT}/usr/lib/swift/linux)
-  find_library(math_LIBRARY NAMES m)
-  if(math_STATIC)
-    add_library(math STATIC IMPORTED GLOBAL)
-  else()
-    add_library(math SHARED IMPORTED GLOBAL)
-  endif()
-  set_target_properties(math PROPERTIES
-    IMPORTED_LOCATION ${math_LIBRARY}
-    INTERFACE_INCLUDE_DIRECTORIES ${math_INCLUDE_DIR} ${math_GLIBC_DIR})
-  find_package_handle_standard_args(math DEFAULT_MSG
-    math_LIBRARY math_INCLUDE_DIR)
+  add_library(SwiftMath INTERFACE IMPORTED GLOBAL)
+  set_target_properties(SwiftMath PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES ${SwiftMath_INCLUDE_DIR} ${SwiftMath_GLIBC_DIR})
+  find_package_handle_standard_args(SwiftMath DEFAULT_MSG SwiftMath_INCLUDE_DIR)
 else()
   # TODO: Windows
-  message(FATAL_ERROR "Findmath.cmake module search not implemented for targeted platform\n")
+  message(FATAL_ERROR "FindSwiftMath.cmake module search not implemented for targeted platform\n")
 endif()