Mercurial > embed
changeset 73:46012b0dea51
Style
author | David Demelier <markand@malikania.fr> |
---|---|
date | Fri, 19 Oct 2018 21:16:00 +0200 |
parents | ce077d93ce14 |
children | 7e333d2bc45d |
files | duktape/CMakeLists.txt fmt/CMakeLists.txt gtest/CMakeLists.txt hoedown/CMakeLists.txt jansson/CMakeLists.txt json/CMakeLists.txt mstch/src/CMakeLists.txt pugixml/CMakeLists.txt sqlite/CMakeLists.txt tests/duktape/main.cpp tests/fmt/main.cpp tests/gtest/main.cpp tests/hoedown/main.cpp tests/jansson/main.cpp tests/json/main.cpp tests/mstch/main.cpp tests/pugixml/main.cpp tests/sqlite/main.cpp tests/uriparser/main.cpp tests/yaml/main.cpp uriparser/CMakeLists.txt yaml/CMakeLists.txt |
diffstat | 22 files changed, 237 insertions(+), 236 deletions(-) [+] |
line wrap: on
line diff
--- a/duktape/CMakeLists.txt Wed Jul 18 13:02:56 2018 +0200 +++ b/duktape/CMakeLists.txt Fri Oct 19 21:16:00 2018 +0200 @@ -20,9 +20,9 @@ project(libduktape) add_library(libduktape duk_config.h duktape.cpp duktape.h) target_include_directories( - libduktape - PUBLIC - $<BUILD_INTERFACE:${libduktape_SOURCE_DIR}> + libduktape + PUBLIC + $<BUILD_INTERFACE:${libduktape_SOURCE_DIR}> ) target_compile_definitions(libduktape PUBLIC DUK_OPT_CPP_EXCEPTIONS) set_target_properties(libduktape PROPERTIES PREFIX "")
--- a/fmt/CMakeLists.txt Wed Jul 18 13:02:56 2018 +0200 +++ b/fmt/CMakeLists.txt Fri Oct 19 21:16:00 2018 +0200 @@ -3,9 +3,9 @@ # cmake_minimum_required(VERSION 3.1.0) -project(fmt) +project(libfmt) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${fmt_SOURCE_DIR}/support/cmake") +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${libfmt_SOURCE_DIR}/support/cmake") include(cxx14) include(CheckCXXCompilerFlag) @@ -13,44 +13,44 @@ include(CheckSymbolExists) if (WIN32) - check_symbol_exists(open io.h HAVE_OPEN) + check_symbol_exists(open io.h HAVE_OPEN) else () - check_symbol_exists(open fcntl.h HAVE_OPEN) + check_symbol_exists(open fcntl.h HAVE_OPEN) endif () set( - HEADERS - ${libfmt_SOURCE_DIR}/include/fmt/core.h - ${libfmt_SOURCE_DIR}/include/fmt/format.h - ${libfmt_SOURCE_DIR}/include/fmt/format-inl.h - ${libfmt_SOURCE_DIR}/include/fmt/ostream.h - ${libfmt_SOURCE_DIR}/include/fmt/printf.h - ${libfmt_SOURCE_DIR}/include/fmt/time.h - ${libfmt_SOURCE_DIR}/include/fmt/ranges.h + HEADERS + ${libfmt_SOURCE_DIR}/include/fmt/core.h + ${libfmt_SOURCE_DIR}/include/fmt/format.h + ${libfmt_SOURCE_DIR}/include/fmt/format-inl.h + ${libfmt_SOURCE_DIR}/include/fmt/ostream.h + ${libfmt_SOURCE_DIR}/include/fmt/printf.h + ${libfmt_SOURCE_DIR}/include/fmt/time.h + ${libfmt_SOURCE_DIR}/include/fmt/ranges.h ) set(FMT_SOURCES ${libfmt_SOURCE_DIR}/src/format.cc) if (HAVE_OPEN) - set(FMT_HEADERS ${FMT_HEADERS} ${libfmt_SOURCE_DIR}/include/fmt/posix.h) - set(FMT_SOURCES ${FMT_SOURCES} ${libfmt_SOURCE_DIR}/src/posix.cc) + set(FMT_HEADERS ${FMT_HEADERS} ${libfmt_SOURCE_DIR}/include/fmt/posix.h) + set(FMT_SOURCES ${FMT_SOURCES} ${libfmt_SOURCE_DIR}/src/posix.cc) endif () add_library(libfmt ${FMT_SOURCES} ${FMT_HEADERS}) set_target_properties(libfmt PROPERTIES PREFIX "") target_include_directories( - libfmt - PUBLIC - $<BUILD_INTERFACE:${fmt_SOURCE_DIR}/include> + libfmt + PUBLIC + $<BUILD_INTERFACE:${libfmt_SOURCE_DIR}/include> ) if (BUILD_SHARED_LIBS) - if (UNIX AND NOT APPLE) - # Fix rpmlint warning: - # unused-direct-shlib-dependency /usr/lib/libformat.so.1.1.0 /lib/libm.so.6. - target_link_libraries(libfmt -Wl,--as-needed) - endif () + if (UNIX AND NOT APPLE) + # Fix rpmlint warning: + # unused-direct-shlib-dependency /usr/lib/libformat.so.1.1.0 /lib/libm.so.6. + target_link_libraries(libfmt -Wl,--as-needed) + endif () - target_compile_definitions(libfmt PRIVATE FMT_EXPORT INTERFACE FMT_SHARED) + target_compile_definitions(libfmt PRIVATE FMT_EXPORT INTERFACE FMT_SHARED) endif ()
--- a/gtest/CMakeLists.txt Wed Jul 18 13:02:56 2018 +0200 +++ b/gtest/CMakeLists.txt Fri Oct 19 21:16:00 2018 +0200 @@ -22,17 +22,17 @@ add_library(libgtest src/gtest-all.cc) target_include_directories( - libgtest - PUBLIC $<BUILD_INTERFACE:${gtest_SOURCE_DIR}/include> - PRIVATE ${gtest_SOURCE_DIR} + libgtest + PUBLIC $<BUILD_INTERFACE:${gtest_SOURCE_DIR}/include> + PRIVATE ${gtest_SOURCE_DIR} ) if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - target_compile_options(libgtest PUBLIC -Wno-missing-field-initializers -Wno-unused-variable) + target_compile_options(libgtest PUBLIC -Wno-missing-field-initializers -Wno-unused-variable) endif () if (NOT WIN32) - target_link_libraries(libgtest -pthread) + target_link_libraries(libgtest -pthread) endif () set_target_properties(libgtest PROPERTIES PREFIX "")
--- a/hoedown/CMakeLists.txt Wed Jul 18 13:02:56 2018 +0200 +++ b/hoedown/CMakeLists.txt Fri Oct 19 21:16:00 2018 +0200 @@ -20,37 +20,37 @@ project(libhoedown C) set( - SOURCES - ${libhoedown_SOURCE_DIR}/src/autolink.c - ${libhoedown_SOURCE_DIR}/src/buffer.c - ${libhoedown_SOURCE_DIR}/src/document.c - ${libhoedown_SOURCE_DIR}/src/escape.c - ${libhoedown_SOURCE_DIR}/src/html_blocks.c - ${libhoedown_SOURCE_DIR}/src/html.c - ${libhoedown_SOURCE_DIR}/src/html_smartypants.c - ${libhoedown_SOURCE_DIR}/src/stack.c - ${libhoedown_SOURCE_DIR}/src/version.c + SOURCES + ${libhoedown_SOURCE_DIR}/src/autolink.c + ${libhoedown_SOURCE_DIR}/src/buffer.c + ${libhoedown_SOURCE_DIR}/src/document.c + ${libhoedown_SOURCE_DIR}/src/escape.c + ${libhoedown_SOURCE_DIR}/src/html_blocks.c + ${libhoedown_SOURCE_DIR}/src/html.c + ${libhoedown_SOURCE_DIR}/src/html_smartypants.c + ${libhoedown_SOURCE_DIR}/src/stack.c + ${libhoedown_SOURCE_DIR}/src/version.c ) set( - HEADERS - ${libhoedown_SOURCE_DIR}/include/hoedown/autolink.h - ${libhoedown_SOURCE_DIR}/include/hoedown/buffer.h - ${libhoedown_SOURCE_DIR}/include/hoedown/document.h - ${libhoedown_SOURCE_DIR}/include/hoedown/escape.h - ${libhoedown_SOURCE_DIR}/include/hoedown/html.h - ${libhoedown_SOURCE_DIR}/include/hoedown/stack.h - ${libhoedown_SOURCE_DIR}/include/hoedown/version.h + HEADERS + ${libhoedown_SOURCE_DIR}/include/hoedown/autolink.h + ${libhoedown_SOURCE_DIR}/include/hoedown/buffer.h + ${libhoedown_SOURCE_DIR}/include/hoedown/document.h + ${libhoedown_SOURCE_DIR}/include/hoedown/escape.h + ${libhoedown_SOURCE_DIR}/include/hoedown/html.h + ${libhoedown_SOURCE_DIR}/include/hoedown/stack.h + ${libhoedown_SOURCE_DIR}/include/hoedown/version.h ) add_library(libhoedown ${SOURCES} ${HEADERS}) target_include_directories( - libhoedown - PUBLIC $<BUILD_INTERFACE:${libhoedown_SOURCE_DIR}/include> - PRIVATE ${libhoedown_SOURCE_DIR}/include/hoedown + libhoedown + PUBLIC $<BUILD_INTERFACE:${libhoedown_SOURCE_DIR}/include> + PRIVATE ${libhoedown_SOURCE_DIR}/include/hoedown ) set_target_properties(libhoedown PROPERTIES PREFIX "") if (MSVC) - target_compile_definitions(libhoedown PRIVATE _CRT_SECURE_NO_WARNINGS) + target_compile_definitions(libhoedown PRIVATE _CRT_SECURE_NO_WARNINGS) endif ()
--- a/jansson/CMakeLists.txt Wed Jul 18 13:02:56 2018 +0200 +++ b/jansson/CMakeLists.txt Fri Oct 19 21:16:00 2018 +0200 @@ -42,15 +42,15 @@ check_type_size("int" INT) if (HAVE_INT32_T) - set(JSON_INT32 int32_t) + set(JSON_INT32 int32_t) elseif (HAVE___INT32) - set(JSON_INT32 __int32) + set(JSON_INT32 __int32) elseif (HAVE_LONG_INT AND (${LONG_INT} EQUAL 4)) - set(JSON_INT32 long) + set(JSON_INT32 long) elseif (HAVE_INT AND (${INT} EQUAL 4)) - set(JSON_INT32 int) + set(JSON_INT32 int) else () - message (FATAL_ERROR "Could not detect a valid 32-bit integer type") + message (FATAL_ERROR "Could not detect a valid 32-bit integer type") endif () check_type_size("unsigned long" UNSIGNED_LONG_INT) @@ -60,52 +60,52 @@ check_type_size(__uint32 __UINT32) if (HAVE_UINT32_T) - set(JSON_UINT32 uint32_t) + set(JSON_UINT32 uint32_t) elseif (HAVE___UINT32) - set(JSON_UINT32 __uint32) + set(JSON_UINT32 __uint32) elseif (HAVE_UNSIGNED_LONG_INT AND (${UNSIGNED_LONG_INT} EQUAL 4)) - set(JSON_UINT32 "unsigned long") + set(JSON_UINT32 "unsigned long") elseif (HAVE_UNSIGNED_INT AND (${UNSIGNED_INT} EQUAL 4)) - set(JSON_UINT32 "unsigned int") + set(JSON_UINT32 "unsigned int") else () - message(FATAL_ERROR "Could not detect a valid unsigned 32-bit integer type") + message(FATAL_ERROR "Could not detect a valid unsigned 32-bit integer type") endif () check_type_size(uint16_t UINT16_T) check_type_size(__uint16 __UINT16) if (HAVE_UINT16_T) - set(JSON_UINT16 uint16_t) + set(JSON_UINT16 uint16_t) elseif (HAVE___UINT16) - set(JSON_UINT16 __uint16) + set(JSON_UINT16 __uint16) elseif (HAVE_UNSIGNED_INT AND (${UNSIGNED_INT} EQUAL 2)) - set(JSON_UINT16 "unsigned int") + set(JSON_UINT16 "unsigned int") elseif (HAVE_UNSIGNED_SHORT AND (${UNSIGNED_SHORT} EQUAL 2)) - set(JSON_UINT16 "unsigned short") + set(JSON_UINT16 "unsigned short") else () - message(FATAL_ERROR "Could not detect a valid unsigned 16-bit integer type") + message(FATAL_ERROR "Could not detect a valid unsigned 16-bit integer type") endif () check_type_size(uint8_t UINT8_T) check_type_size(__uint8 __UINT8) if (HAVE_UINT8_T) - set(JSON_UINT8 uint8_t) + set(JSON_UINT8 uint8_t) elseif (HAVE___UINT8) - set(JSON_UINT8 __uint8) + set(JSON_UINT8 __uint8) else () - set(JSON_UINT8 "unsigned char") + set(JSON_UINT8 "unsigned char") endif () check_type_size(ssize_t SSIZE_T) check_type_size(SSIZE_T UPPERCASE_SSIZE_T) if(NOT HAVE_SSIZE_T) - if(HAVE_UPPERCASE_SSIZE_T) - set(JSON_SSIZE SSIZE_T) - else() - set(JSON_SSIZE int) - endif() + if(HAVE_UPPERCASE_SSIZE_T) + set(JSON_SSIZE SSIZE_T) + else() + set(JSON_SSIZE int) + endif() endif() set(CMAKE_EXTRA_INCLUDE_FILES "") @@ -115,42 +115,42 @@ check_function_exists(_strtoi64 HAVE__STRTOI64) if (HAVE_STRTOLL) - set(JSON_STRTOINT strtoll) + set(JSON_STRTOINT strtoll) elseif (HAVE_STRTOQ) - set(JSON_STRTOINT strtoq) + set(JSON_STRTOINT strtoq) elseif (HAVE__STRTOI64) - set(JSON_STRTOINT _strtoi64) + set(JSON_STRTOINT _strtoi64) else () - set (JSON_STRTOINT strtol) - set (JSON_INT_T long) - set (JSON_INTEGER_FORMAT "\"ld\"") + set (JSON_STRTOINT strtol) + set (JSON_INT_T long) + set (JSON_INTEGER_FORMAT "\"ld\"") endif () if (NOT DEFINED JSON_INT_T) - if (HAVE_LONG_LONG_INT AND (${LONG_LONG_INT} EQUAL 8)) - set(JSON_INT_T "long long") - elseif (HAVE_INT64_T) - set(JSON_INT_T int64_t) - elseif (HAVE___INT64) - set(JSON_INT_T __int64) - else () - message(FATAL_ERROR "Could not detect 64 bit type, although I detected the strtoll equivalent") - endif () + if (HAVE_LONG_LONG_INT AND (${LONG_LONG_INT} EQUAL 8)) + set(JSON_INT_T "long long") + elseif (HAVE_INT64_T) + set(JSON_INT_T int64_t) + elseif (HAVE___INT64) + set(JSON_INT_T __int64) + else () + message(FATAL_ERROR "Could not detect 64 bit type, although I detected the strtoll equivalent") + endif () - if (WIN32) - set(JSON_INTEGER_FORMAT "\"I64d\"") - else () - set(JSON_INTEGER_FORMAT "\"lld\"") - endif () + if (WIN32) + set(JSON_INTEGER_FORMAT "\"I64d\"") + else () + set(JSON_INTEGER_FORMAT "\"lld\"") + endif () endif () check_include_files (locale.h HAVE_LOCALE_H) check_function_exists (localeconv HAVE_LOCALECONV) if (HAVE_LOCALECONV AND HAVE_LOCALE_H) - set(JSON_HAVE_LOCALECONV 1) + set(JSON_HAVE_LOCALECONV 1) else () - set(JSON_HAVE_LOCALECONV 0) + set(JSON_HAVE_LOCALECONV 0) endif() check_function_exists(setlocale HAVE_SETLOCALE) @@ -160,86 +160,86 @@ check_function_keywords("__inline__") if (HAVE_INLINE) - set(JSON_INLINE inline) + set(JSON_INLINE inline) elseif (HAVE___INLINE) - set(JSON_INLINE __inline) + set(JSON_INLINE __inline) elseif (HAVE___INLINE__) - set(JSON_INLINE __inline__) + set(JSON_INLINE __inline__) else() - set (JSON_INLINE) + set (JSON_INLINE) endif() check_function_exists(snprintf HAVE_SNPRINTF) check_function_exists(_snprintf HAVE__SNPRINTF) if (HAVE_SNPRINTF) - set(JSON_SNPRINTF snprintf) + set(JSON_SNPRINTF snprintf) elseif (HAVE__SNPRINTF) - set(JSON_SNPRINTF _snprintf) + set(JSON_SNPRINTF _snprintf) endif () check_c_source_compiles("int main() { unsigned long val; __sync_bool_compare_and_swap(&val, 0, 1); return 0; } " HAVE_SYNC_BUILTINS) check_c_source_compiles("int main() { char l; unsigned long v; __atomic_test_and_set(&l, __ATOMIC_RELAXED); __atomic_store_n(&v, 1, __ATOMIC_RELEASE); __atomic_load_n(&v, __ATOMIC_ACQUIRE); return 0; }" HAVE_ATOMIC_BUILTINS) configure_file( - ${libjansson_SOURCE_DIR}/cmake/jansson_config.h.cmake - ${libjansson_BINARY_DIR}/include/jansson_config.h + ${libjansson_SOURCE_DIR}/cmake/jansson_config.h.cmake + ${libjansson_BINARY_DIR}/include/jansson_config.h ) file( - COPY ${libjansson_SOURCE_DIR}/src/jansson.h - DESTINATION ${libjansson_BINARY_DIR}/include/ + COPY ${libjansson_SOURCE_DIR}/src/jansson.h + DESTINATION ${libjansson_BINARY_DIR}/include/ ) add_definitions(-DJANSSON_USING_CMAKE) configure_file( - ${libjansson_SOURCE_DIR}/cmake/jansson_private_config.h.cmake - ${libjansson_BINARY_DIR}/private_include/jansson_private_config.h + ${libjansson_SOURCE_DIR}/cmake/jansson_private_config.h.cmake + ${libjansson_BINARY_DIR}/private_include/jansson_private_config.h ) add_definitions(-DHAVE_CONFIG_H) set( - JANSSON_SRC - ${libjansson_SOURCE_DIR}/src/dump.c - ${libjansson_SOURCE_DIR}/src/error.c - ${libjansson_SOURCE_DIR}/src/hashtable.c - ${libjansson_SOURCE_DIR}/src/hashtable_seed.c - ${libjansson_SOURCE_DIR}/src/load.c - ${libjansson_SOURCE_DIR}/src/memory.c - ${libjansson_SOURCE_DIR}/src/pack_unpack.c - ${libjansson_SOURCE_DIR}/src/strbuffer.c - ${libjansson_SOURCE_DIR}/src/strconv.c - ${libjansson_SOURCE_DIR}/src/utf.c - ${libjansson_SOURCE_DIR}/src/value.c + JANSSON_SRC + ${libjansson_SOURCE_DIR}/src/dump.c + ${libjansson_SOURCE_DIR}/src/error.c + ${libjansson_SOURCE_DIR}/src/hashtable.c + ${libjansson_SOURCE_DIR}/src/hashtable_seed.c + ${libjansson_SOURCE_DIR}/src/load.c + ${libjansson_SOURCE_DIR}/src/memory.c + ${libjansson_SOURCE_DIR}/src/pack_unpack.c + ${libjansson_SOURCE_DIR}/src/strbuffer.c + ${libjansson_SOURCE_DIR}/src/strconv.c + ${libjansson_SOURCE_DIR}/src/utf.c + ${libjansson_SOURCE_DIR}/src/value.c ) set( - JANSSON_HDR_PRIVATE - ${libjansson_SOURCE_DIR}/src/hashtable.h - ${libjansson_SOURCE_DIR}/src/jansson_private.h - ${libjansson_SOURCE_DIR}/src/strbuffer.h - ${libjansson_SOURCE_DIR}/src/utf.h - ${libjansson_BINARY_DIR}/private_include/jansson_private_config.h + JANSSON_HDR_PRIVATE + ${libjansson_SOURCE_DIR}/src/hashtable.h + ${libjansson_SOURCE_DIR}/src/jansson_private.h + ${libjansson_SOURCE_DIR}/src/strbuffer.h + ${libjansson_SOURCE_DIR}/src/utf.h + ${libjansson_BINARY_DIR}/private_include/jansson_private_config.h ) set( - JANSSON_HDR_PUBLIC - ${libjansson_BINARY_DIR}/include/jansson_config.h - ${libjansson_SOURCE_DIR}/src/jansson.h + JANSSON_HDR_PUBLIC + ${libjansson_BINARY_DIR}/include/jansson_config.h + ${libjansson_SOURCE_DIR}/src/jansson.h ) add_library(libjansson ${JANSSON_SRC} ${JANSSON_HDR_PRIVATE} ${JANSSON_HDR_PUBLIC}) set_target_properties(libjansson PROPERTIES PREFIX "") target_include_directories( - libjansson - PUBLIC $<BUILD_INTERFACE:${libjansson_BINARY_DIR}/include> - PRIVATE ${libjansson_BINARY_DIR}/private_include + libjansson + PUBLIC $<BUILD_INTERFACE:${libjansson_BINARY_DIR}/include> + PRIVATE ${libjansson_BINARY_DIR}/private_include ) if (MSVC) - target_compile_definitions(libjansson PUBLIC _CRT_SECURE_NO_WARNINGS) - target_compile_options(libjansson PUBLIC /W3 /D /wd4005 /wd4996 /wd4334 /wd4267) + target_compile_definitions(libjansson PUBLIC _CRT_SECURE_NO_WARNINGS) + target_compile_options(libjansson PUBLIC /W3 /D /wd4005 /wd4996 /wd4334 /wd4267) endif()
--- a/json/CMakeLists.txt Wed Jul 18 13:02:56 2018 +0200 +++ b/json/CMakeLists.txt Fri Oct 19 21:16:00 2018 +0200 @@ -20,8 +20,8 @@ project(libjson) add_library(libjson INTERFACE) target_include_directories( - libjson - INTERFACE - $<BUILD_INTERFACE:${libjson_SOURCE_DIR}> + libjson + INTERFACE + $<BUILD_INTERFACE:${libjson_SOURCE_DIR}> ) target_sources(libjson INTERFACE ${libjson_SOURCE_DIR}/json.hpp)
--- a/mstch/src/CMakeLists.txt Wed Jul 18 13:02:56 2018 +0200 +++ b/mstch/src/CMakeLists.txt Fri Oct 19 21:16:00 2018 +0200 @@ -1,26 +1,26 @@ find_package(Boost 1.54 REQUIRED) add_library( - libmstch - state/in_section.cpp - state/outside_section.cpp - state/render_state.hpp - visitor/get_token.hpp - visitor/has_token.hpp - visitor/is_node_empty.hpp - visitor/render_node.hpp - visitor/render_section.hpp - mstch.cpp - render_context.cpp - template_type.cpp - token.cpp - utils.cpp + libmstch + state/in_section.cpp + state/outside_section.cpp + state/render_state.hpp + visitor/get_token.hpp + visitor/has_token.hpp + visitor/is_node_empty.hpp + visitor/render_node.hpp + visitor/render_section.hpp + mstch.cpp + render_context.cpp + template_type.cpp + token.cpp + utils.cpp ) target_include_directories( - libmstch - PRIVATE ${mstch_SOURCE_DIR}/src - PUBLIC $<BUILD_INTERFACE:${mstch_SOURCE_DIR}/include> + libmstch + PRIVATE ${mstch_SOURCE_DIR}/src + PUBLIC $<BUILD_INTERFACE:${mstch_SOURCE_DIR}/include> ) target_link_libraries(libmstch Boost::boost)
--- a/pugixml/CMakeLists.txt Wed Jul 18 13:02:56 2018 +0200 +++ b/pugixml/CMakeLists.txt Fri Oct 19 21:16:00 2018 +0200 @@ -20,16 +20,16 @@ project(libpugixml CXX) set( - SOURCES - ${libpugixml_SOURCE_DIR}/src/pugiconfig.hpp - ${libpugixml_SOURCE_DIR}/src/pugixml.cpp - ${libpugixml_SOURCE_DIR}/src/pugixml.hpp + SOURCES + ${libpugixml_SOURCE_DIR}/src/pugiconfig.hpp + ${libpugixml_SOURCE_DIR}/src/pugixml.cpp + ${libpugixml_SOURCE_DIR}/src/pugixml.hpp ) add_library(libpugixml ${SOURCES}) target_include_directories( - libpugixml - PUBLIC - $<BUILD_INTERFACE:${libpugixml_SOURCE_DIR}/src> + libpugixml + PUBLIC + $<BUILD_INTERFACE:${libpugixml_SOURCE_DIR}/src> ) set_target_properties(libpugixml PROPERTIES PREFIX "")
--- a/sqlite/CMakeLists.txt Wed Jul 18 13:02:56 2018 +0200 +++ b/sqlite/CMakeLists.txt Fri Oct 19 21:16:00 2018 +0200 @@ -20,13 +20,14 @@ project(libsqlite C) add_library(libsqlite CMakeLists.txt sqlite3.c sqlite3ext.h sqlite3.h) set_target_properties(libsqlite PROPERTIES PREFIX "") +find_package(Threads REQUIRED) target_include_directories( - libsqlite - PUBLIC - $<BUILD_INTERFACE:${libsqlite_SOURCE_DIR}> + libsqlite + PUBLIC + $<BUILD_INTERFACE:${libsqlite_SOURCE_DIR}> ) target_link_libraries( - libsqlite - $<$<STREQUAL:${CMAKE_SYSTEM_NAME},Linux>:dl> - $<$<BOOL:${UNIX}>:-pthread> + libsqlite + ${CMAKE_DL_LIBS} + Threads::Threads )
--- a/tests/duktape/main.cpp Wed Jul 18 13:02:56 2018 +0200 +++ b/tests/duktape/main.cpp Fri Oct 19 21:16:00 2018 +0200 @@ -20,5 +20,5 @@ int main() { - duk_create_heap_default(); + duk_create_heap_default(); }
--- a/tests/fmt/main.cpp Wed Jul 18 13:02:56 2018 +0200 +++ b/tests/fmt/main.cpp Fri Oct 19 21:16:00 2018 +0200 @@ -20,5 +20,5 @@ int main() { - fmt::format("hello"); + fmt::format("hello"); }
--- a/tests/gtest/main.cpp Wed Jul 18 13:02:56 2018 +0200 +++ b/tests/gtest/main.cpp Fri Oct 19 21:16:00 2018 +0200 @@ -24,5 +24,5 @@ int main() { - return RUN_ALL_TESTS(); + return RUN_ALL_TESTS(); }
--- a/tests/hoedown/main.cpp Wed Jul 18 13:02:56 2018 +0200 +++ b/tests/hoedown/main.cpp Fri Oct 19 21:16:00 2018 +0200 @@ -20,5 +20,5 @@ int main() { - hoedown_html_renderer_new(static_cast<hoedown_html_flags>(0), 0); + hoedown_html_renderer_new(static_cast<hoedown_html_flags>(0), 0); }
--- a/tests/jansson/main.cpp Wed Jul 18 13:02:56 2018 +0200 +++ b/tests/jansson/main.cpp Fri Oct 19 21:16:00 2018 +0200 @@ -20,5 +20,5 @@ int main() { - json_true(); + json_true(); }
--- a/tests/json/main.cpp Wed Jul 18 13:02:56 2018 +0200 +++ b/tests/json/main.cpp Fri Oct 19 21:16:00 2018 +0200 @@ -20,5 +20,5 @@ int main() { - nlohmann::json(); + nlohmann::json(); }
--- a/tests/mstch/main.cpp Wed Jul 18 13:02:56 2018 +0200 +++ b/tests/mstch/main.cpp Fri Oct 19 21:16:00 2018 +0200 @@ -20,6 +20,6 @@ int main() { - mstch::map map; - mstch::render("test", map); + mstch::map map; + mstch::render("test", map); }
--- a/tests/pugixml/main.cpp Wed Jul 18 13:02:56 2018 +0200 +++ b/tests/pugixml/main.cpp Fri Oct 19 21:16:00 2018 +0200 @@ -20,5 +20,5 @@ int main() { - pugi::xml_document doc; + pugi::xml_document doc; }
--- a/tests/sqlite/main.cpp Wed Jul 18 13:02:56 2018 +0200 +++ b/tests/sqlite/main.cpp Fri Oct 19 21:16:00 2018 +0200 @@ -20,5 +20,5 @@ int main() { - sqlite3_open(0, 0); + sqlite3_open(0, 0); }
--- a/tests/uriparser/main.cpp Wed Jul 18 13:02:56 2018 +0200 +++ b/tests/uriparser/main.cpp Fri Oct 19 21:16:00 2018 +0200 @@ -20,11 +20,11 @@ int main() { - UriParserStateA state; - UriUriA uri; + UriParserStateA state; + UriUriA uri; - state.uri = &uri; + state.uri = &uri; - uriParseUriA(&state, "file:///home/user/song.mp3"); - uriFreeUriMembersA(&uri); + uriParseUriA(&state, "file:///home/user/song.mp3"); + uriFreeUriMembersA(&uri); }
--- a/tests/yaml/main.cpp Wed Jul 18 13:02:56 2018 +0200 +++ b/tests/yaml/main.cpp Fri Oct 19 21:16:00 2018 +0200 @@ -20,5 +20,5 @@ int main() { - yaml_parser_initialize(nullptr); + yaml_parser_initialize(nullptr); }
--- a/uriparser/CMakeLists.txt Wed Jul 18 13:02:56 2018 +0200 +++ b/uriparser/CMakeLists.txt Fri Oct 19 21:16:00 2018 +0200 @@ -20,42 +20,42 @@ project(liburiparser C) set( - HEADERS - ${liburiparser_SOURCE_DIR}/include/uriparser/UriBase.h - ${liburiparser_SOURCE_DIR}/include/uriparser/UriDefsAnsi.h - ${liburiparser_SOURCE_DIR}/include/uriparser/UriDefsConfig.h - ${liburiparser_SOURCE_DIR}/include/uriparser/UriDefsUnicode.h - ${liburiparser_SOURCE_DIR}/include/uriparser/Uri.h - ${liburiparser_SOURCE_DIR}/include/uriparser/UriIp4.h + HEADERS + ${liburiparser_SOURCE_DIR}/include/uriparser/UriBase.h + ${liburiparser_SOURCE_DIR}/include/uriparser/UriDefsAnsi.h + ${liburiparser_SOURCE_DIR}/include/uriparser/UriDefsConfig.h + ${liburiparser_SOURCE_DIR}/include/uriparser/UriDefsUnicode.h + ${liburiparser_SOURCE_DIR}/include/uriparser/Uri.h + ${liburiparser_SOURCE_DIR}/include/uriparser/UriIp4.h ) set( - SOURCES - ${liburiparser_SOURCE_DIR}/src/UriCommon.c - ${liburiparser_SOURCE_DIR}/src/UriCommon.h - ${liburiparser_SOURCE_DIR}/src/UriCompare.c - ${liburiparser_SOURCE_DIR}/src/UriEscape.c - ${liburiparser_SOURCE_DIR}/src/UriFile.c - ${liburiparser_SOURCE_DIR}/src/UriIp4Base.c - ${liburiparser_SOURCE_DIR}/src/UriIp4Base.h - ${liburiparser_SOURCE_DIR}/src/UriIp4.c - ${liburiparser_SOURCE_DIR}/src/UriNormalizeBase.c - ${liburiparser_SOURCE_DIR}/src/UriNormalizeBase.h - ${liburiparser_SOURCE_DIR}/src/UriNormalize.c - ${liburiparser_SOURCE_DIR}/src/UriParseBase.c - ${liburiparser_SOURCE_DIR}/src/UriParseBase.h - ${liburiparser_SOURCE_DIR}/src/UriParse.c - ${liburiparser_SOURCE_DIR}/src/UriQuery.c - ${liburiparser_SOURCE_DIR}/src/UriRecompose.c - ${liburiparser_SOURCE_DIR}/src/UriResolve.c - ${liburiparser_SOURCE_DIR}/src/UriShorten.c + SOURCES + ${liburiparser_SOURCE_DIR}/src/UriCommon.c + ${liburiparser_SOURCE_DIR}/src/UriCommon.h + ${liburiparser_SOURCE_DIR}/src/UriCompare.c + ${liburiparser_SOURCE_DIR}/src/UriEscape.c + ${liburiparser_SOURCE_DIR}/src/UriFile.c + ${liburiparser_SOURCE_DIR}/src/UriIp4Base.c + ${liburiparser_SOURCE_DIR}/src/UriIp4Base.h + ${liburiparser_SOURCE_DIR}/src/UriIp4.c + ${liburiparser_SOURCE_DIR}/src/UriNormalizeBase.c + ${liburiparser_SOURCE_DIR}/src/UriNormalizeBase.h + ${liburiparser_SOURCE_DIR}/src/UriNormalize.c + ${liburiparser_SOURCE_DIR}/src/UriParseBase.c + ${liburiparser_SOURCE_DIR}/src/UriParseBase.h + ${liburiparser_SOURCE_DIR}/src/UriParse.c + ${liburiparser_SOURCE_DIR}/src/UriQuery.c + ${liburiparser_SOURCE_DIR}/src/UriRecompose.c + ${liburiparser_SOURCE_DIR}/src/UriResolve.c + ${liburiparser_SOURCE_DIR}/src/UriShorten.c ) add_library(liburiparser ${HEADERS} ${SOURCES}) target_include_directories( - liburiparser - PUBLIC - $<BUILD_INTERFACE:${liburiparser_SOURCE_DIR}/include> + liburiparser + PUBLIC + $<BUILD_INTERFACE:${liburiparser_SOURCE_DIR}/include> ) set_target_properties(liburiparser PROPERTIES PREFIX "")
--- a/yaml/CMakeLists.txt Wed Jul 18 13:02:56 2018 +0200 +++ b/yaml/CMakeLists.txt Fri Oct 19 21:16:00 2018 +0200 @@ -25,37 +25,37 @@ set(YAML_VERSION_STRING "${YAML_VERSION_MAJOR}.${YAML_VERSION_MINOR}.${YAML_VERSION_PATCH}") set( - SOURCES - ${libyaml_SOURCE_DIR}/src/api.c - ${libyaml_SOURCE_DIR}/src/dumper.c - ${libyaml_SOURCE_DIR}/src/emitter.c - ${libyaml_SOURCE_DIR}/src/loader.c - ${libyaml_SOURCE_DIR}/src/parser.c - ${libyaml_SOURCE_DIR}/src/reader.c - ${libyaml_SOURCE_DIR}/src/scanner.c - ${libyaml_SOURCE_DIR}/src/writer.c - ${libyaml_SOURCE_DIR}/src/yaml_private.h + SOURCES + ${libyaml_SOURCE_DIR}/src/api.c + ${libyaml_SOURCE_DIR}/src/dumper.c + ${libyaml_SOURCE_DIR}/src/emitter.c + ${libyaml_SOURCE_DIR}/src/loader.c + ${libyaml_SOURCE_DIR}/src/parser.c + ${libyaml_SOURCE_DIR}/src/reader.c + ${libyaml_SOURCE_DIR}/src/scanner.c + ${libyaml_SOURCE_DIR}/src/writer.c + ${libyaml_SOURCE_DIR}/src/yaml_private.h ) add_library(libyaml ${SOURCES}) set_target_properties(libyaml PROPERTIES PREFIX "") target_include_directories( - libyaml - PUBLIC - $<BUILD_INTERFACE:${libyaml_SOURCE_DIR}/include> + libyaml + PUBLIC + $<BUILD_INTERFACE:${libyaml_SOURCE_DIR}/include> ) target_compile_definitions( - libyaml - PRIVATE - YAML_DECLARE_STATIC - YAML_VERSION_MAJOR=${YAML_VERSION_MAJOR} - YAML_VERSION_MINOR=${YAML_VERSION_MINOR} - YAML_VERSION_PATCH=${YAML_VERSION_PATCH} - YAML_VERSION_STRING="${YAML_VERSION_STRING}" + libyaml + PRIVATE + YAML_DECLARE_STATIC + YAML_VERSION_MAJOR=${YAML_VERSION_MAJOR} + YAML_VERSION_MINOR=${YAML_VERSION_MINOR} + YAML_VERSION_PATCH=${YAML_VERSION_PATCH} + YAML_VERSION_STRING="${YAML_VERSION_STRING}" ) if (MSVC) - target_compile_definitions(libyaml PUBLIC _CRT_SECURE_NO_WARNINGS) - target_compile_options(libyaml PUBLIC /wd4244 /wd4267 /wd4996) + target_compile_definitions(libyaml PUBLIC _CRT_SECURE_NO_WARNINGS) + target_compile_options(libyaml PUBLIC /wd4244 /wd4267 /wd4996) endif ()