jasder
/
simdjson
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Merge pull request #850 from furkanusta/cmake-taketwo 

Only install singleheader/simdjson.h as part of the public API
This commit is contained in:
John Keiser 2020-05-02 09:06:06 -07:00 committed by GitHub
parent fa4ce6a8bc e04cbd71d0
commit 1153aaf55b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/CMakeLists.txt
View File

@ -11,6 +11,3 @@ target_include_directories(simdjson-headers INTERFACE
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCDIR}>)
install(TARGETS simdjson-headers EXPORT simdjson-config INCLUDES DESTINATION include)
install(DIRECTORY simdjson DESTINATION include FILES_MATCHING PATTERN *.h)
install(DIRECTORY simdjson DESTINATION include FILES_MATCHING PATTERN *.hpp)
install(FILES simdjson.h DESTINATION include)

3
singleheader/CMakeLists.txt
View File

@ -72,7 +72,6 @@ else(MSVC)
# "make amalgamate" to generate the header files directly and update the original source
#
add_custom_target(amalgamate DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/simdjson.cpp ${CMAKE_CURRENT_SOURCE_DIR}/simdjson.h ${CMAKE_CURRENT_SOURCE_DIR}/amalgamate_demo.cpp ${CMAKE_CURRENT_SOURCE_DIR}/README.md)
endif(MSVC)
@ -96,3 +95,5 @@ add_dependencies(simdjson-singleheader-source amalgamate)
add_executable(amalgamate_demo $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/amalgamate_demo.cpp>)
target_link_libraries(amalgamate_demo simdjson-singleheader-include-source simdjson-flags)
add_test(amalgamate_demo amalgamate_demo ${EXAMPLE_JSON} ${EXAMPLE_NDJSON})
install(FILES simdjson.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})