Skip to content

Fix CMake files for composable usage through both XCode and Ninja generators #824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Fix CMake files for composable usage through both XCode and Ninja generators #824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67decfc
Fix #72841 Bug
tothambrus11 Aug 14, 2025
6c357bc
Remove questionable cmake commands
tothambrus11 Aug 14, 2025
30fb0e4
remove explicit output/module directory settings
tothambrus11 Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ option(BUILD_SHARED_LIBS "Build shared libraries by default" YES)

list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)

set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

set(CMAKE_Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift)

include(CTest)

include(GNUInstallDirs)
Expand Down
6 changes: 2 additions & 4 deletions Sources/ArgumentParser/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,9 @@ add_library(ArgumentParser
Validators/ParsableArgumentsValidation.swift
Validators/PositionalArgumentsValidator.swift
Validators/UniqueNamesValidator.swift)
# NOTE: workaround for CMake not setting up include flags yet
set_target_properties(ArgumentParser PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})

target_compile_options(ArgumentParser PRIVATE
$<$<BOOL:${BUILD_TESTING}>:-enable-testing>)
$<$<BOOL:${BUILD_TESTING}>:-enable-testing> -enable-library-evolution)
target_link_libraries(ArgumentParser PRIVATE
ArgumentParserToolInfo)
if(Foundation_FOUND)
Expand Down
7 changes: 5 additions & 2 deletions Sources/ArgumentParser/Parsing/CommandParser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,9 @@ struct AutodetectedGenerateCompletions: ParsableCommand {
@Flag() var generateCompletionScript = false
}

func swiftBug72841Unwrap<T>(_ x: T) -> T { x }
func swiftBug72841Unwrap<T>(_ x: T?) -> T { x! }

extension CommandParser {
func checkForCompletionScriptRequest(_ split: inout SplitArguments) throws {
// Pseudo-commands don't support `--generate-completion-script` flag
Expand All @@ -363,14 +366,14 @@ extension CommandParser {
throw CommandError(
commandStack: commandStack,
parserError: .completionScriptRequested(
shell: result.generateCompletionScript))
shell: swiftBug72841Unwrap(result).generateCompletionScript))
}

// Check for for `--generate-completion-script` without a value
var autodetectedParser = CommandParser(AutodetectedGenerateCompletions.self)
if let result = try? autodetectedParser.parseCurrent(&split)
as? AutodetectedGenerateCompletions,
result.generateCompletionScript
swiftBug72841Unwrap(result).generateCompletionScript
{
throw CommandError(
commandStack: commandStack,
Expand Down
2 changes: 0 additions & 2 deletions Sources/ArgumentParserTestHelpers/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
add_library(ArgumentParserTestHelpers
StringHelpers.swift
TestHelpers.swift)
set_target_properties(ArgumentParserTestHelpers PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
target_link_libraries(ArgumentParserTestHelpers PUBLIC
ArgumentParser
ArgumentParserToolInfo)
Expand Down
3 changes: 0 additions & 3 deletions Sources/ArgumentParserToolInfo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
add_library(ArgumentParserToolInfo STATIC
ToolInfo.swift)
# NOTE: workaround for CMake not setting up include flags yet
set_target_properties(ArgumentParserToolInfo PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
target_compile_options(ArgumentParserToolInfo PRIVATE
$<$<BOOL:${BUILD_TESTING}>:-enable-testing>)

Expand Down