The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[simdjson] Update to 2019-03-05

Browse Source
This commit is contained in:
myd7349 2019-03-05 08:23:35 +08:00
parent b758b9c359
commit 4327f4d82c
3 changed files with 4 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/simdjson/CONTROL
View File

@ -1,3 +1,3 @@
Source: simdjson
Version: 2019-03-03
Version: 2019-03-05
Description: A extremely fast JSON library that can parse gigabytes of JSON per second

70
ports/simdjson/fix-cmake.patch
View File

@ -1,70 +0,0 @@
diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
index cb12222..ed728d8 100644
--- a/benchmark/CMakeLists.txt
+++ b/benchmark/CMakeLists.txt
@@ -1,7 +1,6 @@
-target_include_directories(${SIMDJSON_LIB_NAME}
- PUBLIC
- ${PROJECT_SOURCE_DIR}/benchmark
- ${PROJECT_SOURCE_DIR}/benchmark/linux
+target_include_directories(${SIMDJSON_LIB_NAME} INTERFACE
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/benchmark>
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/benchmark/linux>
)
add_cpp_benchmark(parse)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dd96ee8..20feac3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,6 +3,7 @@ if(${CMAKE_C_COMPILER_ID} MATCHES "Intel") # icc / icpc
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-intel")
endif()
+include(GNUInstallDirs)
# we default on a shared library.
if(SIMDJSON_BUILD_STATIC)
@@ -26,11 +27,24 @@ set(SIMDJSON_SRC
)
add_library(${SIMDJSON_LIB_NAME} ${SIMDJSON_LIB_TYPE} ${SIMDJSON_SRC})
-target_include_directories(${SIMDJSON_LIB_NAME}
- PUBLIC ${PROJECT_SOURCE_DIR}/include
+
+target_include_directories(${SIMDJSON_LIB_NAME} PUBLIC
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+
+install(TARGETS ${SIMDJSON_LIB_NAME}
+ EXPORT ${SIMDJSON_LIB_NAME}-config
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
-install(TARGETS ${SIMDJSON_LIB_NAME} DESTINATION lib)
+install(EXPORT ${SIMDJSON_LIB_NAME}-config
+ FILE unofficial-${SIMDJSON_LIB_NAME}-config.cmake
+ NAMESPACE unofficial::${SIMDJSON_LIB_NAME}::
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/unofficial-${SIMDJSON_LIB_NAME}
+)
if(NOT MSVC)
## We output the library at the root of the current directory where cmake is invoked
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 86a89f9..c3dfa12 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,7 +1,7 @@
if(MSVC)
-target_include_directories(${SIMDJSON_LIB_NAME}
- PUBLIC ${PROJECT_SOURCE_DIR}/windows
-)
+ target_include_directories(${SIMDJSON_LIB_NAME} INTERFACE
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/windows>
+ )
endif()
add_cpp_test(jsoncheck)

11
ports/simdjson/portfile.cmake
View File

@ -7,11 +7,9 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO lemire/simdjson
REF 352dd5e7faf3000004c6ad5852c119ce3e679939
SHA512 29c578952d7aa117fe5808ceb2cb686895185d5f53bee3fff6636ac6fe6e50e1cc802499710eda4f233e3c5ff57ebf187ff6658fd5048a59cee8cfd8fca64c1d
REF 5040840578de7eb5c80c0250585d03b2f096a4ff
SHA512 be1d07b12a6ed2fdd61862cf8f049209467f1cfd40ad4a73d4da9a31147b83f1e60fc205b64bb311e15fa97432a42aad8a6e3eb5aa0dcc8a0c3afb47b55b6aac
HEAD_REF master
PATCHES
fix-cmake.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMDJSON_BUILD_STATIC)
@ -27,10 +25,7 @@ vcpkg_install_cmake()
vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets(
CONFIG_PATH lib/cmake/unofficial-${PORT}
TARGET_PATH share/unofficial-${PORT}
)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include