use cmake 4.0.1 (#240)

cmake 4.0 unsets CMAKE_OSX_SYSROOT
CMP0157 splits swift compile and link

Author: eagleoflqj

.github/workflows/ci.yml

@@ -44,7 +44,7 @@ jobs:
         with:
           xcode-version: 16.2
 
-      - uses: lukka/get-cmake@v3.31.6
+      - uses: lukka/get-cmake@v4.0.1
 
       - uses: actions/setup-node@v4
         with:

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.27)
+cmake_minimum_required(VERSION 4.0.1)
 
 project(fcitx5-macos VERSION 0.2.1 LANGUAGES CXX Swift)
 
@@ -12,9 +12,15 @@ if(NOT CMAKE_OSX_ARCHITECTURES)
     set(CMAKE_OSX_ARCHITECTURES "${CMAKE_HOST_SYSTEM_PROCESSOR}")
 endif()
 
+# Starting from cmake 4.0, CMAKE_OSX_SYSROOT defaults to empty.
+execute_process(COMMAND xcrun --sdk macosx --show-sdk-path
+    OUTPUT_VARIABLE CMAKE_OSX_SYSROOT
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
 set(CMAKE_OSX_DEPLOYMENT_TARGET 13.3)
 set(F5M_TARGET "${CMAKE_OSX_ARCHITECTURES}-apple-macos${CMAKE_OSX_DEPLOYMENT_TARGET}")
-add_definitions(-target "${F5M_TARGET}")
+add_compile_options(-target "${F5M_TARGET}")
+add_link_options(-target "${F5M_TARGET}")
 
 # Disallow InitializeSwift to execute link_directories which adds Xcode paths to rpath.
 set(SWIFT_LIBRARY_SEARCH_PATHS "")

src/CMakeLists.txt

@@ -26,17 +26,13 @@ if(VERBOSE_LOGGING)
 endif()
 
 target_link_libraries(Fcitx5Objs
-    SwiftyJSON
-    SwiftFrontend
-    SwiftNotify
     Fcitx5::Core
     keyboard
     webpanel
     beast
     macosfrontend
     notifications
     WebviewCandidateWindow
-    Logging
 )
 
 add_executable(Fcitx5
@@ -53,6 +49,7 @@ target_link_libraries(Fcitx5
     SwiftyJSON
     SwiftFrontend
     SwiftNotify
+    Logging
 )
 
 fcitx5_import_addons(Fcitx5

tests/CMakeLists.txt

@@ -1,35 +1,38 @@
 # Config and Option
-add_executable(config-swift testconfig.swift
+add_executable(ConfigSwift testconfig.swift
     ${PROJECT_SOURCE_DIR}/src/config/optionmodels.swift
     ${PROJECT_SOURCE_DIR}/src/config/config.swift
 )
-target_link_libraries(config-swift Fcitx5Objs Logging SwiftyJSON)
-add_test(NAME config-swift COMMAND config-swift)
+target_compile_options(ConfigSwift PUBLIC
+    "$<$<COMPILE_LANGUAGE:Swift>:-cxx-interoperability-mode=default>"
+)
+target_link_libraries(ConfigSwift Fcitx5Objs Logging SwiftyJSON SwiftFrontend)
+add_test(NAME ConfigSwift COMMAND ConfigSwift)
 
 add_executable(config-cpp testconfig.cpp)
-target_link_libraries(config-cpp Fcitx5Objs)
+target_link_libraries(config-cpp Fcitx5Objs SwiftFrontend)
 fcitx5_import_addons(config-cpp
     REGISTRY_VARNAME getStaticAddon
     ADDONS keyboard
 )
 add_test(NAME config-cpp COMMAND config-cpp)
 
 # CustomPhrase .plist parser
-add_executable(xml-parser testxmlparser.swift
+add_executable(XmlParser testxmlparser.swift
     ${PROJECT_SOURCE_DIR}/src/config/xmlparser.swift
 )
-add_test(NAME xml-parser COMMAND xml-parser "${PROJECT_SOURCE_DIR}/tests/customphrase.plist")
+add_test(NAME XmlParser COMMAND XmlParser "${PROJECT_SOURCE_DIR}/tests/customphrase.plist")
 
 add_executable(key-cpp testkey.cpp)
 target_link_libraries(key-cpp Keycode)
 add_test(NAME key-cpp COMMAND key-cpp)
 
-add_executable(key-swift testkey.swift
+add_executable(KeySwift testkey.swift
     ${PROJECT_SOURCE_DIR}/src/config/keycode.swift
     ${PROJECT_SOURCE_DIR}/src/config/keyrecorder.swift
 )
-target_compile_options(key-swift PUBLIC
+target_compile_options(KeySwift PUBLIC
     "$<$<COMPILE_LANGUAGE:Swift>:-cxx-interoperability-mode=default>"
 )
-target_link_libraries(key-swift Keycode)
-add_test(NAME key-swift COMMAND key-swift)
+target_link_libraries(KeySwift Keycode)
+add_test(NAME KeySwift COMMAND KeySwift)