# HG changeset patch # User David Demelier # Date 1531477650 -7200 # Node ID 6b612e43bfeedca6c4cb33e8c850c2c0e6000010 # Parent b36a0d91bf7b38d1691d5e7f644701a5e680d8c6 cmake: prefix libraries with lib, closes #880 @10m diff -r b36a0d91bf7b -r 6b612e43bfee CMakeLists.txt --- a/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -25,7 +25,7 @@ add_subdirectory(tests/hoedown) add_subdirectory(tests/jansson) add_subdirectory(tests/json) -add_subdirectory(tests/libzip) +#add_subdirectory(tests/libzip) add_subdirectory(tests/pugixml) add_subdirectory(tests/sqlite) add_subdirectory(tests/yaml) diff -r b36a0d91bf7b -r 6b612e43bfee duktape/CMakeLists.txt --- a/duktape/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/duktape/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -17,7 +17,8 @@ # cmake_minimum_required(VERSION 3.0) -project(duktape) -add_library(duktape STATIC duk_config.h duktape.cpp duktape.h) -target_include_directories(duktape PUBLIC ${duktape_SOURCE_DIR}) -target_compile_definitions(duktape PUBLIC DUK_OPT_CPP_EXCEPTIONS) +project(libduktape) +add_library(libduktape STATIC duk_config.h duktape.cpp duktape.h) +target_include_directories(libduktape PUBLIC ${libduktape_SOURCE_DIR}) +target_compile_definitions(libduktape PUBLIC DUK_OPT_CPP_EXCEPTIONS) +set_target_properties(libduktape PROPERTIES PREFIX "") diff -r b36a0d91bf7b -r 6b612e43bfee fmt/CMakeLists.txt --- a/fmt/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/fmt/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -17,6 +17,7 @@ # cmake_minimum_required(VERSION 3.0) -project(fmt) -add_library(fmt STATIC format.cc format.h) -target_include_directories(fmt PUBLIC ${fmt_SOURCE_DIR}) +project(libfmt) +add_library(libfmt STATIC format.cc format.h) +target_include_directories(libfmt PUBLIC ${libfmt_SOURCE_DIR}) +set_target_properties(libfmt PROPERTIES PREFIX "") diff -r b36a0d91bf7b -r 6b612e43bfee gtest/CMakeLists.txt --- a/gtest/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/gtest/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -17,22 +17,24 @@ # cmake_minimum_required(VERSION 3.0) -project(GoogleTest) +project(gtest) -add_library(gtest src/gtest-all.cc) +add_library(libgtest src/gtest-all.cc) target_include_directories( - gtest + libgtest PUBLIC - ${GoogleTest_SOURCE_DIR}/include + ${gtest_SOURCE_DIR}/include PRIVATE - ${GoogleTest_SOURCE_DIR} + ${gtest_SOURCE_DIR} ) if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - target_compile_options(gtest 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(gtest -pthread) + target_link_libraries(libgtest -pthread) endif () + +set_target_properties(libgtest PROPERTIES PREFIX "") diff -r b36a0d91bf7b -r 6b612e43bfee hoedown/CMakeLists.txt --- a/hoedown/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/hoedown/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -17,39 +17,40 @@ # cmake_minimum_required(VERSION 3.0) -project(hoedown C) +project(libhoedown C) set( SOURCES - ${hoedown_SOURCE_DIR}/src/autolink.c - ${hoedown_SOURCE_DIR}/src/buffer.c - ${hoedown_SOURCE_DIR}/src/document.c - ${hoedown_SOURCE_DIR}/src/escape.c - ${hoedown_SOURCE_DIR}/src/html_blocks.c - ${hoedown_SOURCE_DIR}/src/html.c - ${hoedown_SOURCE_DIR}/src/html_smartypants.c - ${hoedown_SOURCE_DIR}/src/stack.c - ${hoedown_SOURCE_DIR}/src/version.c + ${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 - ${hoedown_SOURCE_DIR}/include/hoedown/autolink.h - ${hoedown_SOURCE_DIR}/include/hoedown/buffer.h - ${hoedown_SOURCE_DIR}/include/hoedown/document.h - ${hoedown_SOURCE_DIR}/include/hoedown/escape.h - ${hoedown_SOURCE_DIR}/include/hoedown/html.h - ${hoedown_SOURCE_DIR}/include/hoedown/stack.h - ${hoedown_SOURCE_DIR}/include/hoedown/version.h + ${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(hoedown STATIC ${SOURCES} ${HEADERS}) +add_library(libhoedown STATIC ${SOURCES} ${HEADERS}) target_include_directories( - hoedown - PUBLIC ${hoedown_SOURCE_DIR}/include - PRIVATE ${hoedown_SOURCE_DIR}/include/hoedown + libhoedown + PUBLIC ${libhoedown_SOURCE_DIR}/include + PRIVATE ${libhoedown_SOURCE_DIR}/include/hoedown ) +set_target_properties(libhoedown PROPERTIES PREFIX "") if (MSVC) - target_compile_definitions(hoedown PRIVATE _CRT_SECURE_NO_WARNINGS) + target_compile_definitions(libhoedown PRIVATE _CRT_SECURE_NO_WARNINGS) endif () diff -r b36a0d91bf7b -r 6b612e43bfee jansson/CMakeLists.txt --- a/jansson/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/jansson/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -27,12 +27,12 @@ # cmake_minimum_required(VERSION 3.0) -project(jansson C) +project(libjansson C) option(USE_URANDOM "Use /dev/urandom to seed the hash function." On) option(USE_WINDOWS_CRYPTOAPI "Use CryptGenRandom to seed the hash function." On) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${jansson_SOURCE_DIR}/cmake) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${libjansson_SOURCE_DIR}/cmake) include(CheckCSourceCompiles) include(CheckFunctionExists) @@ -206,63 +206,64 @@ 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( - ${jansson_SOURCE_DIR}/cmake/jansson_config.h.cmake - ${jansson_BINARY_DIR}/include/jansson_config.h + ${libjansson_SOURCE_DIR}/cmake/jansson_config.h.cmake + ${libjansson_BINARY_DIR}/include/jansson_config.h ) file( - COPY ${jansson_SOURCE_DIR}/src/jansson.h - DESTINATION ${jansson_BINARY_DIR}/include/ + COPY ${libjansson_SOURCE_DIR}/src/jansson.h + DESTINATION ${libjansson_BINARY_DIR}/include/ ) add_definitions(-DJANSSON_USING_CMAKE) configure_file( - ${jansson_SOURCE_DIR}/cmake/jansson_private_config.h.cmake - ${jansson_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 - ${jansson_SOURCE_DIR}/src/dump.c - ${jansson_SOURCE_DIR}/src/error.c - ${jansson_SOURCE_DIR}/src/hashtable.c - ${jansson_SOURCE_DIR}/src/hashtable_seed.c - ${jansson_SOURCE_DIR}/src/load.c - ${jansson_SOURCE_DIR}/src/memory.c - ${jansson_SOURCE_DIR}/src/pack_unpack.c - ${jansson_SOURCE_DIR}/src/strbuffer.c - ${jansson_SOURCE_DIR}/src/strconv.c - ${jansson_SOURCE_DIR}/src/utf.c - ${jansson_SOURCE_DIR}/src/value.c + ${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 - ${jansson_SOURCE_DIR}/src/hashtable.h - ${jansson_SOURCE_DIR}/src/jansson_private.h - ${jansson_SOURCE_DIR}/src/strbuffer.h - ${jansson_SOURCE_DIR}/src/utf.h - ${jansson_BINARY_DIR}/private_include/jansson_private_config.h + ${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 - ${jansson_BINARY_DIR}/include/jansson_config.h - ${jansson_SOURCE_DIR}/src/jansson.h + ${libjansson_BINARY_DIR}/include/jansson_config.h + ${libjansson_SOURCE_DIR}/src/jansson.h ) -add_library(jansson STATIC ${JANSSON_SRC} ${JANSSON_HDR_PRIVATE} ${JANSSON_HDR_PUBLIC}) +add_library(libjansson STATIC ${JANSSON_SRC} ${JANSSON_HDR_PRIVATE} ${JANSSON_HDR_PUBLIC}) +set_target_properties(libjansson PROPERTIES PREFIX "") target_include_directories( - jansson - PUBLIC ${jansson_BINARY_DIR}/include - PRIVATE ${jansson_BINARY_DIR}/private_include + libjansson + PUBLIC ${libjansson_BINARY_DIR}/include + PRIVATE ${libjansson_BINARY_DIR}/private_include ) if (MSVC) - target_compile_definitions(jansson PUBLIC _CRT_SECURE_NO_WARNINGS) - target_compile_options(jansson 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() diff -r b36a0d91bf7b -r 6b612e43bfee json/CMakeLists.txt --- a/json/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/json/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -17,7 +17,7 @@ # cmake_minimum_required(VERSION 3.0) -project(json) -add_library(json INTERFACE) -target_include_directories(json INTERFACE ${json_SOURCE_DIR}) -target_sources(json INTERFACE ${json_SOURCE_DIR}/json.hpp) +project(libjson) +add_library(libjson INTERFACE) +target_include_directories(libjson INTERFACE ${libjson_SOURCE_DIR}) +target_sources(libjson INTERFACE ${libjson_SOURCE_DIR}/json.hpp) diff -r b36a0d91bf7b -r 6b612e43bfee pugixml/CMakeLists.txt --- a/pugixml/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/pugixml/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -17,14 +17,15 @@ # cmake_minimum_required(VERSION 3.0) -project(pugixml CXX) +project(libpugixml CXX) set( SOURCES - ${pugixml_SOURCE_DIR}/src/pugiconfig.hpp - ${pugixml_SOURCE_DIR}/src/pugixml.cpp - ${pugixml_SOURCE_DIR}/src/pugixml.hpp + ${libpugixml_SOURCE_DIR}/src/pugiconfig.hpp + ${libpugixml_SOURCE_DIR}/src/pugixml.cpp + ${libpugixml_SOURCE_DIR}/src/pugixml.hpp ) -add_library(pugixml STATIC ${SOURCES}) -target_include_directories(pugixml PUBLIC ${pugixml_SOURCE_DIR}/src) +add_library(libpugixml STATIC ${SOURCES}) +target_include_directories(libpugixml PUBLIC ${libpugixml_SOURCE_DIR}/src) +set_target_properties(libpugixml PROPERTIES PREFIX "") diff -r b36a0d91bf7b -r 6b612e43bfee sqlite/CMakeLists.txt --- a/sqlite/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/sqlite/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -17,11 +17,12 @@ # cmake_minimum_required(VERSION 3.5) -project(sqlite C) -add_library(sqlite STATIC CMakeLists.txt sqlite3.c sqlite3ext.h sqlite3.h) -target_include_directories(sqlite PUBLIC ${sqlite_SOURCE_DIR}) +project(libsqlite C) +add_library(libsqlite STATIC CMakeLists.txt sqlite3.c sqlite3ext.h sqlite3.h) +target_include_directories(libsqlite PUBLIC ${libsqlite_SOURCE_DIR}) +set_target_properties(libsqlite PROPERTIES PREFIX "") target_link_libraries( - sqlite + libsqlite $<$:dl> $<$:-pthread> ) diff -r b36a0d91bf7b -r 6b612e43bfee tests/duktape/CMakeLists.txt --- a/tests/duktape/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/tests/duktape/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -20,4 +20,4 @@ project(test-duktape) add_subdirectory(../../duktape duktape-build-dir) add_executable(test-duktape main.cpp) -target_link_libraries(test-duktape duktape) +target_link_libraries(test-duktape libduktape) diff -r b36a0d91bf7b -r 6b612e43bfee tests/fmt/CMakeLists.txt --- a/tests/fmt/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/tests/fmt/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -20,5 +20,4 @@ project(test-fmt) add_subdirectory(../../fmt fmt-build-dir) add_executable(test-fmt main.cpp) -target_link_libraries(test-fmt fmt) - +target_link_libraries(test-fmt libfmt) diff -r b36a0d91bf7b -r 6b612e43bfee tests/gtest/CMakeLists.txt --- a/tests/gtest/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/tests/gtest/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -20,4 +20,4 @@ project(test-gtest) add_subdirectory(../../gtest gtest-build-dir) add_executable(test-gtest main.cpp) -target_link_libraries(test-gtest gtest) +target_link_libraries(test-gtest libgtest) diff -r b36a0d91bf7b -r 6b612e43bfee tests/hoedown/CMakeLists.txt --- a/tests/hoedown/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/tests/hoedown/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -20,4 +20,4 @@ project(test-hoedown) add_subdirectory(../../hoedown hoedown-build-dir) add_executable(test-hoedown main.cpp) -target_link_libraries(test-hoedown hoedown) +target_link_libraries(test-hoedown libhoedown) diff -r b36a0d91bf7b -r 6b612e43bfee tests/jansson/CMakeLists.txt --- a/tests/jansson/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/tests/jansson/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -20,4 +20,4 @@ project(test-jansson) add_subdirectory(../../jansson jansson-build-dir) add_executable(test-jansson main.cpp) -target_link_libraries(test-jansson jansson) +target_link_libraries(test-jansson libjansson) diff -r b36a0d91bf7b -r 6b612e43bfee tests/json/CMakeLists.txt --- a/tests/json/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/tests/json/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -20,4 +20,4 @@ project(test-json) add_subdirectory(../../json json-build-dir) add_executable(test-json main.cpp) -target_link_libraries(test-json json) +target_link_libraries(test-json libjson) diff -r b36a0d91bf7b -r 6b612e43bfee tests/libzip/CMakeLists.txt --- a/tests/libzip/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/tests/libzip/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -20,4 +20,4 @@ project(test-libzip) add_subdirectory(../../libzip libzip-build-dir) add_executable(test-libzip main.cpp) -target_link_libraries(test-libzip zip) +target_link_libraries(test-libzip libzip) diff -r b36a0d91bf7b -r 6b612e43bfee tests/pugixml/CMakeLists.txt --- a/tests/pugixml/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/tests/pugixml/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -20,4 +20,4 @@ project(test-pugixml) add_subdirectory(../../pugixml pugixml-build-dir) add_executable(test-pugixml main.cpp) -target_link_libraries(test-pugixml pugixml) +target_link_libraries(test-pugixml libpugixml) diff -r b36a0d91bf7b -r 6b612e43bfee tests/sqlite/CMakeLists.txt --- a/tests/sqlite/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/tests/sqlite/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -20,4 +20,4 @@ project(test-sqlite) add_subdirectory(../../sqlite sqlite-build-dir) add_executable(test-sqlite main.cpp) -target_link_libraries(test-sqlite sqlite) +target_link_libraries(test-sqlite libsqlite) diff -r b36a0d91bf7b -r 6b612e43bfee tests/uriparser/CMakeLists.txt --- a/tests/uriparser/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/tests/uriparser/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -20,4 +20,4 @@ project(test-uriparser) add_subdirectory(../../uriparser uriparser-build-dir) add_executable(test-uriparser main.cpp) -target_link_libraries(test-uriparser uriparser) +target_link_libraries(test-uriparser liburiparser) diff -r b36a0d91bf7b -r 6b612e43bfee tests/yaml/CMakeLists.txt --- a/tests/yaml/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/tests/yaml/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -20,4 +20,4 @@ project(test-yaml) add_subdirectory(../../yaml yaml-build-dir) add_executable(test-yaml main.cpp) -target_link_libraries(test-yaml yaml) +target_link_libraries(test-yaml libyaml) diff -r b36a0d91bf7b -r 6b612e43bfee uriparser/CMakeLists.txt --- a/uriparser/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/uriparser/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -17,44 +17,45 @@ # cmake_minimum_required(VERSION 3.5) -project(uriparser C) +project(liburiparser C) set( HEADERS - ${uriparser_SOURCE_DIR}/include/uriparser/UriBase.h - ${uriparser_SOURCE_DIR}/include/uriparser/UriDefsAnsi.h - ${uriparser_SOURCE_DIR}/include/uriparser/UriDefsConfig.h - ${uriparser_SOURCE_DIR}/include/uriparser/UriDefsUnicode.h - ${uriparser_SOURCE_DIR}/include/uriparser/Uri.h - ${uriparser_SOURCE_DIR}/include/uriparser/UriIp4.h + ${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 - ${uriparser_SOURCE_DIR}/src/UriCommon.c - ${uriparser_SOURCE_DIR}/src/UriCommon.h - ${uriparser_SOURCE_DIR}/src/UriCompare.c - ${uriparser_SOURCE_DIR}/src/UriEscape.c - ${uriparser_SOURCE_DIR}/src/UriFile.c - ${uriparser_SOURCE_DIR}/src/UriIp4Base.c - ${uriparser_SOURCE_DIR}/src/UriIp4Base.h - ${uriparser_SOURCE_DIR}/src/UriIp4.c - ${uriparser_SOURCE_DIR}/src/UriNormalizeBase.c - ${uriparser_SOURCE_DIR}/src/UriNormalizeBase.h - ${uriparser_SOURCE_DIR}/src/UriNormalize.c - ${uriparser_SOURCE_DIR}/src/UriParseBase.c - ${uriparser_SOURCE_DIR}/src/UriParseBase.h - ${uriparser_SOURCE_DIR}/src/UriParse.c - ${uriparser_SOURCE_DIR}/src/UriQuery.c - ${uriparser_SOURCE_DIR}/src/UriRecompose.c - ${uriparser_SOURCE_DIR}/src/UriResolve.c - ${uriparser_SOURCE_DIR}/src/UriShorten.c + ${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(uriparser ${HEADERS} ${SOURCES}) +add_library(liburiparser ${HEADERS} ${SOURCES}) target_include_directories( - uriparser + liburiparser PUBLIC - $ + $ ) +set_target_properties(liburiparser PROPERTIES PREFIX "") diff -r b36a0d91bf7b -r 6b612e43bfee yaml/CMakeLists.txt --- a/yaml/CMakeLists.txt Fri Jul 13 10:52:59 2018 +0200 +++ b/yaml/CMakeLists.txt Fri Jul 13 12:27:30 2018 +0200 @@ -17,7 +17,7 @@ # cmake_minimum_required(VERSION 3.0) -project(yaml C) +project(libyaml C) set(YAML_VERSION_MAJOR 0) set(YAML_VERSION_MINOR 1) @@ -26,32 +26,32 @@ set( SOURCES - src/api.c - src/dumper.c - src/emitter.c - src/loader.c - src/parser.c - src/reader.c - src/scanner.c - src/writer.c - src/yaml_private.h + ${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(yaml STATIC ${SOURCES}) - -target_include_directories(yaml PUBLIC ${yaml_SOURCE_DIR}/include) +add_library(libyaml STATIC ${SOURCES}) +target_include_directories(libyaml PUBLIC ${libyaml_SOURCE_DIR}/include) +set_target_properties(libyaml PROPERTIES PREFIX "") target_compile_definitions( - yaml + 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}\" + YAML_VERSION_STRING="${YAML_VERSION_STRING}" ) if (MSVC) - target_compile_definitions(yaml PUBLIC _CRT_SECURE_NO_WARNINGS) - target_compile_options(yaml PUBLIC /wd4244 /wd4267 /wd4996) + target_compile_definitions(libyaml PUBLIC _CRT_SECURE_NO_WARNINGS) + target_compile_options(libyaml PUBLIC /wd4244 /wd4267 /wd4996) endif ()