diff options
| author | zi-m <53815290+zi-m@users.noreply.github.com> | 2019-10-03 00:51:41 +0200 |
|---|---|---|
| committer | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-10-02 15:51:40 -0700 |
| commit | 16a2ec4e996e4a5569e300b09ad520d807d586d4 (patch) | |
| tree | e5b64c98e5bb60121074d02bfe582e46e1e2a538 | |
| parent | 3db8ce2d6613f963e083fc700c3a74d6e6d9c80b (diff) | |
| download | vcpkg-16a2ec4e996e4a5569e300b09ad520d807d586d4.tar.gz vcpkg-16a2ec4e996e4a5569e300b09ad520d807d586d4.zip | |
fix find_package(json5-parser ...) issue (#8401)
| -rw-r--r-- | ports/json5-parser/00001-fix-build.patch | 6 | ||||
| -rw-r--r-- | ports/json5-parser/CONTROL | 2 | ||||
| -rw-r--r-- | ports/json5-parser/portfile.cmake | 3 | ||||
| -rw-r--r-- | ports/json5-parser/usage | 4 |
4 files changed, 5 insertions, 10 deletions
diff --git a/ports/json5-parser/00001-fix-build.patch b/ports/json5-parser/00001-fix-build.patch index 74f34a298..b67f7c47a 100644 --- a/ports/json5-parser/00001-fix-build.patch +++ b/ports/json5-parser/00001-fix-build.patch @@ -1,5 +1,5 @@ diff --git a/json5_parser/CMakeLists.txt b/json5_parser/CMakeLists.txt -index e83fb38..b193c97 100644 +index e83fb38..c09cae4 100644 --- a/json5_parser/CMakeLists.txt +++ b/json5_parser/CMakeLists.txt @@ -15,3 +15,22 @@ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR}) @@ -12,12 +12,12 @@ index e83fb38..b193c97 100644 + +target_include_directories(json5_parser PUBLIC $<INSTALL_INTERFACE:include>) + -+install(TARGETS json5_parser EXPORT json5_parser-config ++install(TARGETS json5_parser EXPORT json5-parser-config + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) -+install(EXPORT json5_parser-config DESTINATION share/cmake/json5_parser) ++install(EXPORT json5-parser-config DESTINATION share/cmake/json5-parser) + +file(GLOB HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} json5_parser*.h) +foreach (HEADER ${HEADERS} ) diff --git a/ports/json5-parser/CONTROL b/ports/json5-parser/CONTROL index 1c740dd3d..891aa1c71 100644 --- a/ports/json5-parser/CONTROL +++ b/ports/json5-parser/CONTROL @@ -1,5 +1,5 @@ Source: json5-parser -Version: 1.0.0 +Version: 1.0.0-1 Homepage: https://bitbucket.org/wlandry/json5_parser Description: An enhancement of the JSON Spirit C++ library to understand json5. Build-Depends: boost-spirit diff --git a/ports/json5-parser/portfile.cmake b/ports/json5-parser/portfile.cmake index 083947621..18ac091bb 100644 --- a/ports/json5-parser/portfile.cmake +++ b/ports/json5-parser/portfile.cmake @@ -18,10 +18,9 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/json5_parser) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/json5-parser) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/json5-parser/copyright COPYONLY) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/json5-parser) diff --git a/ports/json5-parser/usage b/ports/json5-parser/usage deleted file mode 100644 index 950e637a0..000000000 --- a/ports/json5-parser/usage +++ /dev/null @@ -1,4 +0,0 @@ -The package json5-parser provides CMake targets: - - find_package(json5_parser CONFIG REQUIRED) - target_link_libraries(main PRIVATE json5_parser) |