mirror of
https://github.com/Tencent/flare.git
synced 2026-10-17 04:41:22 +08:00
Luo Bo
26 lines
1.2 KiB
Diff
26 lines
1.2 KiB
Diff
diff -uNr a/src/lib_json/CMakeLists.txt b/src/lib_json/CMakeLists.txt
|
|
--- a/src/lib_json/CMakeLists.txt 2021-05-29 03:34:43.485006048 +0800
|
|
+++ b/src/lib_json/CMakeLists.txt 2021-05-29 03:33:51.341006048 +0800
|
|
@@ -48,8 +48,8 @@
|
|
|
|
INSTALL( TARGETS jsoncpp_lib ${INSTALL_EXPORT}
|
|
RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR}
|
|
- LIBRARY DESTINATION "${LIBRARY_INSTALL_DIR}/${CMAKE_LIBRARY_ARCHITECTURE}"
|
|
- ARCHIVE DESTINATION "${ARCHIVE_INSTALL_DIR}/${CMAKE_LIBRARY_ARCHITECTURE}")
|
|
+ LIBRARY DESTINATION "${LIBRARY_INSTALL_DIR}"
|
|
+ ARCHIVE DESTINATION "${ARCHIVE_INSTALL_DIR}")
|
|
|
|
IF(NOT CMAKE_VERSION VERSION_LESS 2.8.11)
|
|
TARGET_INCLUDE_DIRECTORIES( jsoncpp_lib PUBLIC
|
|
@@ -67,8 +67,8 @@
|
|
|
|
INSTALL( TARGETS jsoncpp_lib_static ${INSTALL_EXPORT}
|
|
RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR}
|
|
- LIBRARY DESTINATION "${LIBRARY_INSTALL_DIR}/${CMAKE_LIBRARY_ARCHITECTURE}"
|
|
- ARCHIVE DESTINATION "${ARCHIVE_INSTALL_DIR}/${CMAKE_LIBRARY_ARCHITECTURE}")
|
|
+ LIBRARY DESTINATION "${LIBRARY_INSTALL_DIR}"
|
|
+ ARCHIVE DESTINATION "${ARCHIVE_INSTALL_DIR}")
|
|
|
|
IF(NOT CMAKE_VERSION VERSION_LESS 2.8.11)
|
|
TARGET_INCLUDE_DIRECTORIES( jsoncpp_lib_static PUBLIC
|