Skip to content

Commit 62075e2

Browse files
committed
[CMake] Use a custom variable for libdir path
CMAKE_INSTALL_LIBDIR has wrong value during a clean build for some reason.
1 parent f88e382 commit 62075e2

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ include(CheckLibraryExists)
2222
include(CheckSymbolExists)
2323
include(GNUInstallDirs)
2424

25-
set(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Path where the libraries should be installed")
25+
set(INSTALL_LIBDIR "lib" CACHE PATH "Path where the libraries should be installed")
2626
set(WITH_BLOCKS_RUNTIME "" CACHE PATH "Path to blocks runtime")
2727

2828
include(DispatchAppleOptions)

dispatch/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ install(FILES
1414
source.h
1515
time.h
1616
DESTINATION
17-
"${CMAKE_INSTALL_LIBDIR}/swift/dispatch")
17+
"${INSTALL_LIBDIR}/swift/dispatch")
1818
if(ENABLE_SWIFT)
1919
get_filename_component(MODULE_MAP module.modulemap REALPATH)
2020
install(FILES
2121
${MODULE_MAP}
2222
DESTINATION
23-
"${CMAKE_INSTALL_LIBDIR}/swift/dispatch")
23+
"${INSTALL_LIBDIR}/swift/dispatch")
2424
endif()
2525

os/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ install(FILES
66
object.h
77
linux_base.h
88
DESTINATION
9-
"${CMAKE_INSTALL_LIBDIR}/swift/os")
9+
"${INSTALL_LIBDIR}/swift/os")
1010

src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,12 @@ add_custom_command(TARGET dispatch POST_BUILD
202202
install(TARGETS
203203
dispatch
204204
DESTINATION
205-
"${CMAKE_INSTALL_LIBDIR}/swift/${SWIFT_OS}")
205+
"${INSTALL_LIBDIR}/swift/${SWIFT_OS}")
206206
if(ENABLE_SWIFT)
207207
install(FILES
208208
${CMAKE_CURRENT_BINARY_DIR}/swift/Dispatch.swiftmodule
209209
${CMAKE_CURRENT_BINARY_DIR}/swift/Dispatch.swiftdoc
210210
DESTINATION
211-
"${CMAKE_INSTALL_LIBDIR}/swift/${SWIFT_OS}/${CMAKE_SYSTEM_PROCESSOR}")
211+
"${INSTALL_LIBDIR}/swift/${SWIFT_OS}/${CMAKE_SYSTEM_PROCESSOR}")
212212
endif()
213213

0 commit comments

Comments
 (0)