diff options
| author | myd7349 <myd7349@gmail.com> | 2019-05-30 05:24:41 +0800 |
|---|---|---|
| committer | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-05-29 14:24:40 -0700 |
| commit | dc42151505367ffed6ce1f1744df4b1c1ec1cf7a (patch) | |
| tree | 43bc2fe97ff6740be088b644d98319533234a0e0 /ports/cjson/fix-install-path.patch | |
| parent | 70e7124cc485b943b911b0aae8ae30b4cbce9583 (diff) | |
| download | vcpkg-dc42151505367ffed6ce1f1744df4b1c1ec1cf7a.tar.gz vcpkg-dc42151505367ffed6ce1f1744df4b1c1ec1cf7a.zip | |
[WIP][cjson] Add new port (#6081)
* [cjson] Add new port
* [cjson] Fix cmake targets path
* [cjson] Bump version info
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() |