Skip to content

Commit

Permalink
build: correct ordering of include (apple#608)
Browse files Browse the repository at this point in the history
Correct the ordering that @bnbarham pointed out post-commit.  Ensure
that we adjust the `CMAKE_MODULE_PATH` prior to the use of `include`
which will reference local modules.
  • Loading branch information
compnerd authored Dec 11, 2023
1 parent f031c79 commit 14cba5d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ project(swift-argument-parser
option(BUILD_EXAMPLES "Build Example Programs" TRUE)
option(BUILD_SHARED_LIBS "Build shared libraries by default" YES)

include(CTest)
include(SwiftSupport)

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

set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
Expand All @@ -17,6 +14,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

set(CMAKE_Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift)

include(CTest)
include(SwiftSupport)

find_package(dispatch CONFIG)
find_package(Foundation CONFIG)
find_package(XCTest CONFIG)
Expand Down

0 comments on commit 14cba5d

Please sign in to comment.