tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1--- a/CMakeLists.txt 2017-01-22 19:51:41.000000000 +0000
2+++ b/CMakeLists.txt 2025-10-04 14:08:24.934041902 +0100
3@@ -83,57 +83,21 @@
4
5 # rapidjson
6
7-set(RAPIDJSON_FILE "rapidjson-${RAPIDJSON_COMMIT}.tar.gz")
8-set(RAPIDJSON_DIR "${CONTRIB_DIR}/rapidjson-${RAPIDJSON_COMMIT}")
9-set(RAPIDJSON_URL "https://github.com/miloyip/rapidjson/archive/${RAPIDJSON_COMMIT}.tar.gz")
10-
11-if(EXISTS "${CMAKE_SOURCE_DIR}/contrib/${RAPIDJSON_FILE}")
12- message(STATUS "Found package: ${RAPIDJSON_FILE}")
13-else()
14- message(STATUS "Downloading: ${RAPIDJSON_FILE}")
15- file(DOWNLOAD ${RAPIDJSON_URL} "${CMAKE_SOURCE_DIR}/contrib/${RAPIDJSON_FILE}")
16- if(NOT EXISTS "${CMAKE_SOURCE_DIR}/contrib/${RAPIDJSON_FILE}")
17- message(FATAL_ERROR "\nFailed to download source file: ${RAPIDJSON_FILE}\nFrom: ${RAPIDJSON_URL}")
18- endif()
19-endif()
20-
21-execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf ${CMAKE_SOURCE_DIR}/contrib/${RAPIDJSON_FILE} WORKING_DIRECTORY ${CONTRIB_DIR})
22-
23-include_directories(SYSTEM ${RAPIDJSON_DIR}/include)
24+include_directories(SYSTEM @rapidjson@/include)
25
26
27 # libb64
28
29-set(LIBB64_FILE "libb64-${LIBB64_VERSION}.zip")
30-set(LIBB64_DIR "${CONTRIB_DIR}/libb64-${LIBB64_VERSION}")
31-set(LIBB64_URL "http://downloads.sourceforge.net/project/libb64/libb64/libb64/${LIBB64_FILE}?use_mirror=autoselect")
32-
33-if(EXISTS "${CMAKE_SOURCE_DIR}/contrib/${LIBB64_FILE}")
34- message(STATUS "Found package: ${LIBB64_FILE}")
35-else()
36- message(STATUS "Downloading: ${LIBB64_FILE}")
37- file(DOWNLOAD ${LIBB64_URL} "${CMAKE_SOURCE_DIR}/contrib/${LIBB64_FILE}")
38- if(NOT EXISTS "${CMAKE_SOURCE_DIR}/contrib/${LIBB64_FILE}")
39- message(FATAL_ERROR "\nFailed to download source file: ${LIBB64_FILE}\nFrom: ${LIBB64_URL}")
40- endif()
41-endif()
42-
43-execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${CMAKE_SOURCE_DIR}/contrib/${LIBB64_FILE}" WORKING_DIRECTORY "${CONTRIB_DIR}")
44-
45-# Remove libb64's newlines
46-set(LIBB64_CENCODE_FILE ${LIBB64_DIR}/src/cencode.c)
47-file(READ ${LIBB64_CENCODE_FILE} LIBB64_CENCODE)
48-string(REPLACE "*codechar++ = '\\n';" "/* *codechar++ = '\\n'; */" LIBB64_CENCODE "${LIBB64_CENCODE}")
49-file(WRITE ${LIBB64_CENCODE_FILE} "${LIBB64_CENCODE}")
50-
51-file(GLOB_RECURSE LIBB64_SRCS ${LIBB64_DIR}/src/*.c)
52-include_directories(SYSTEM ${LIBB64_DIR}/include)
53+include_directories(SYSTEM @libb64@/include)
54
55
56 # executable targets
57
58-add_executable(msgpack2json src/msgpack2json.cpp ${MPACK_SRCS} ${LIBB64_SRCS})
59-add_executable(json2msgpack src/json2msgpack.cpp ${MPACK_SRCS} ${LIBB64_SRCS})
60+add_executable(msgpack2json src/msgpack2json.cpp ${MPACK_SRCS})
61+add_executable(json2msgpack src/json2msgpack.cpp ${MPACK_SRCS})
62+
63+target_link_libraries(msgpack2json b64)
64+target_link_libraries(json2msgpack b64)
65
66 install(TARGETS msgpack2json json2msgpack DESTINATION bin)
67