Skip to content

CMake adjustments #69

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

Merged
merged 3 commits into from
Mar 9, 2020
Merged

CMake adjustments #69

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
ec043f4
build: update cmake for TestHelpers rename
compnerd Mar 6, 2020
196902c
build: make CMake build on macOS work
compnerd Mar 6, 2020
2bc97a0
build: refactor Examples build with CMake
compnerd Mar 6, 2020
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
18 changes: 15 additions & 3 deletions Examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
add_subdirectory(math)
add_subdirectory(repeat)
add_subdirectory(roll)
add_executable(math
math/main.swift)
target_link_libraries(math PRIVATE
ArgumentParser)

add_executable(repeat
repeat/main.swift)
target_link_libraries(repeat PRIVATE
ArgumentParser)

add_executable(roll
roll/main.swift
roll/SplitMix64.swift)
target_link_libraries(roll PRIVATE
ArgumentParser)
4 changes: 0 additions & 4 deletions Examples/math/CMakeLists.txt
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions Examples/repeat/CMakeLists.txt
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions Examples/roll/CMakeLists.txt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Sources/ArgumentParser/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ set_target_properties(ArgumentParser PROPERTIES
target_compile_options(ArgumentParser PRIVATE
$<$<BOOL:${BUILD_TESTING}>:-enable-testing>)
target_link_libraries(ArgumentParser PRIVATE
Foundation)
$<$<NOT:$<PLATFORM_ID:Darwin>>:Foundation>)
2 changes: 1 addition & 1 deletion Sources/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
add_subdirectory(ArgumentParser)
if(BUILD_TESTING)
add_subdirectory(TestHelpers)
add_subdirectory(SAPTestHelpers)
endif()
6 changes: 3 additions & 3 deletions Sources/SAPTestHelpers/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
add_library(TestHelpers
add_library(SAPTestHelpers
StringHelpers.swift
TestHelpers.swift)
set_target_properties(TestHelpers PROPERTIES
set_target_properties(SAPTestHelpers PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
target_link_libraries(TestHelpers PUBLIC
target_link_libraries(SAPTestHelpers PUBLIC
ArgumentParser
XCTest)
2 changes: 1 addition & 1 deletion Tests/EndToEndTests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ add_library(EndToEndTests
SubcommandEndToEndTests.swift
ValidationEndToEndTests.swift)
target_link_libraries(EndToEndTests PUBLIC
TestHelpers)
SAPTestHelpers)
2 changes: 1 addition & 1 deletion Tests/UnitTests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ add_library(UnitTests
UsageGenerationTests.swift)
target_link_libraries(UnitTests PRIVATE
ArgumentParser
TestHelpers)
SAPTestHelpers)