Skip to content

Commit b369ac0

Browse files
committed
[CMake] Use CMAKE_*_OUTPUT_DIRECTORY variables instead of custom vars
1 parent 1b30b77 commit b369ac0

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

CMakeLists.txt

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,13 @@ endif()
2525
# The subdirectory into which host libraries will be installed.
2626
set(SWIFT_HOST_LIBRARIES_SUBDIRECTORY "swift/host")
2727

28-
if(SWIFT_HOST_LIBRARIES_DEST_DIR)
29-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${SWIFT_HOST_LIBRARIES_DEST_DIR}")
30-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${SWIFT_HOST_LIBRARIES_DEST_DIR}")
31-
else()
28+
if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
3229
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/${SWIFT_HOST_LIBRARIES_SUBDIRECTORY}")
30+
endif()
31+
if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
3332
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/${SWIFT_HOST_LIBRARIES_SUBDIRECTORY}")
3433
endif()
35-
if(SWIFT_HOST_RUNTIME_DEST_DIR)
36-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${SWIFT_HOST_RUNTIME_DEST_DIR}")
37-
else()
34+
if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
3835
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
3936
endif()
4037

0 commit comments

Comments
 (0)