diff options
| author | NancyLi1013 <lirui09@beyondsoft.com> | 2019-05-29 19:14:40 -0700 |
|---|---|---|
| committer | NancyLi1013 <lirui09@beyondsoft.com> | 2019-05-29 19:14:40 -0700 |
| commit | 668c960d8a2502bfffa861fb56179f56dc1b039c (patch) | |
| tree | 7931df85eebe6cee12f1f12699410dcaf47f486d /ports/cjson/fix-install-path.patch | |
| parent | c23105e854ae67a2daa1987f0ab2be6db7676a73 (diff) | |
| parent | 69d360520460fe6f58b59adc709d526f9a9be248 (diff) | |
| download | vcpkg-668c960d8a2502bfffa861fb56179f56dc1b039c.tar.gz vcpkg-668c960d8a2502bfffa861fb56179f56dc1b039c.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/NancyLi/6006
Diffstat (limited to 'ports/cjson/fix-install-path.patch')
| -rw-r--r-- | ports/cjson/fix-install-path.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/ports/cjson/fix-install-path.patch b/ports/cjson/fix-install-path.patch new file mode 100644 index 000000000..96a65d996 --- /dev/null +++ b/ports/cjson/fix-install-path.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 033a882..6e2b2e4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -149,7 +149,13 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson.pc.in" + + install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson") + install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") +-install(TARGETS "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" EXPORT "${CJSON_LIB}") ++install(TARGETS "${CJSON_LIB}" ++ EXPORT "${CJSON_LIB}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" ++ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" ++ INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}" ++) + if (BUILD_SHARED_AND_STATIC_LIBS) + install(TARGETS "${CJSON_LIB}-static" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}") + endif() +@@ -186,7 +192,13 @@ if(ENABLE_CJSON_UTILS) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson_utils.pc.in" + "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" @ONLY) + +- install(TARGETS "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" EXPORT "${CJSON_UTILS_LIB}") ++ install(TARGETS "${CJSON_UTILS_LIB}" ++ EXPORT "${CJSON_UTILS_LIB}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" ++ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" ++ INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}" ++ ) + if (BUILD_SHARED_AND_STATIC_LIBS) + install(TARGETS "${CJSON_UTILS_LIB}-static" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}") + endif() |