mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 19:39:00 +08:00
dc42151505
* [cjson] Add new port * [cjson] Fix cmake targets path * [cjson] Bump version info
35 lines
1.7 KiB
Diff
35 lines
1.7 KiB
Diff
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()
|