Skip to content

Commit 4d3fc0d

Browse files
authored
Fix broken DIR_LIBRARY usages (#764)
In the commit a13ed0a (PR #763), some DIR_LIBRARY variable usages are modified to make install destination relative to be more portable, but this will break the original designed purpose of DIR_LIBRARY, so this commit will revert the changes.
1 parent a13ed0a commit 4d3fc0d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,15 @@ write_basic_package_version_file(
131131
configure_package_config_file(
132132
OpenCCConfig.cmake.in
133133
${CMAKE_CURRENT_BINARY_DIR}/OpenCCConfig.cmake
134-
INSTALL_DESTINATION lib/cmake/opencc
134+
INSTALL_DESTINATION ${DIR_LIBRARY}/cmake/opencc
135135
)
136136

137137
install(
138138
FILES
139139
${CMAKE_CURRENT_BINARY_DIR}/OpenCCConfig.cmake
140140
${CMAKE_CURRENT_BINARY_DIR}/OpenCCConfigVersion.cmake
141141
DESTINATION
142-
lib/cmake/opencc
142+
${DIR_LIBRARY}/cmake/opencc
143143
)
144144

145145
######## Compiler flags

src/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -150,15 +150,15 @@ endif()
150150

151151
install(
152152
TARGETS ${INSTALL_TARGETS} EXPORT ${targets_export_name}
153-
LIBRARY DESTINATION lib
154-
ARCHIVE DESTINATION lib
153+
LIBRARY DESTINATION ${DIR_LIBRARY}
154+
ARCHIVE DESTINATION ${DIR_LIBRARY}
155155
RUNTIME DESTINATION bin
156156
)
157157

158158
install(
159159
EXPORT ${targets_export_name}
160160
FILE ${targets_export_name}.cmake
161-
DESTINATION lib/cmake/opencc
161+
DESTINATION ${DIR_LIBRARY}/cmake/opencc
162162
NAMESPACE OpenCC::
163163
)
164164

0 commit comments

Comments
 (0)