From cc98bfcce7b15da6e34c0314b3788a56538544a1 Mon Sep 17 00:00:00 2001 From: Chris Loer Date: Fri, 29 Jun 2018 12:50:26 -0700 Subject: [PATCH] [core] Move nunicode into "vendor" directory Switch nunicode.cmake to build nunicode as library instead of adding to mbgl-core as a macro. --- cmake/nunicode.cmake | 55 +++++++------------ platform/android/config.cmake | 2 +- platform/linux/config.cmake | 2 +- platform/qt/config.cmake | 2 +- {nunicode => vendor/nunicode}/LICENSE | 0 {nunicode => vendor/nunicode}/files.txt | 0 .../nunicode}/include/libnu/casemap.h | 0 .../include/libnu/casemap_internal.h | 0 .../nunicode}/include/libnu/config.h | 0 .../nunicode}/include/libnu/defines.h | 0 .../nunicode}/include/libnu/ducet.h | 0 .../nunicode}/include/libnu/libnu.h | 0 .../nunicode}/include/libnu/mph.h | 0 .../nunicode}/include/libnu/strcoll.h | 0 .../include/libnu/strcoll_internal.h | 0 .../nunicode}/include/libnu/strings.h | 0 .../nunicode}/include/libnu/udb.h | 0 .../nunicode}/include/libnu/unaccent.h | 0 .../nunicode}/include/libnu/utf8.h | 0 .../nunicode}/include/libnu/utf8_internal.h | 0 .../nunicode}/src/libnu/ducet.c | 0 .../nunicode}/src/libnu/gen/_ducet.c | 0 .../nunicode}/src/libnu/gen/_ducet_switch.c | 0 .../nunicode}/src/libnu/gen/_tofold.c | 0 .../nunicode}/src/libnu/gen/_tolower.c | 0 .../nunicode}/src/libnu/gen/_tounaccent.c | 0 .../nunicode}/src/libnu/gen/_toupper.c | 0 .../nunicode}/src/libnu/strcoll.c | 0 .../nunicode}/src/libnu/strings.c | 0 .../nunicode}/src/libnu/tofold.c | 0 .../nunicode}/src/libnu/tolower.c | 0 .../nunicode}/src/libnu/tounaccent.c | 0 .../nunicode}/src/libnu/toupper.c | 0 .../nunicode}/src/libnu/utf8.c | 0 {nunicode => vendor/nunicode}/version.txt | 0 35 files changed, 23 insertions(+), 38 deletions(-) rename {nunicode => vendor/nunicode}/LICENSE (100%) rename {nunicode => vendor/nunicode}/files.txt (100%) rename {nunicode => vendor/nunicode}/include/libnu/casemap.h (100%) rename {nunicode => vendor/nunicode}/include/libnu/casemap_internal.h (100%) rename {nunicode => vendor/nunicode}/include/libnu/config.h (100%) rename {nunicode => vendor/nunicode}/include/libnu/defines.h (100%) rename {nunicode => vendor/nunicode}/include/libnu/ducet.h (100%) rename {nunicode => vendor/nunicode}/include/libnu/libnu.h (100%) rename {nunicode => vendor/nunicode}/include/libnu/mph.h (100%) rename {nunicode => vendor/nunicode}/include/libnu/strcoll.h (100%) rename {nunicode => vendor/nunicode}/include/libnu/strcoll_internal.h (100%) rename {nunicode => vendor/nunicode}/include/libnu/strings.h (100%) rename {nunicode => vendor/nunicode}/include/libnu/udb.h (100%) rename {nunicode => vendor/nunicode}/include/libnu/unaccent.h (100%) rename {nunicode => vendor/nunicode}/include/libnu/utf8.h (100%) rename {nunicode => vendor/nunicode}/include/libnu/utf8_internal.h (100%) rename {nunicode => vendor/nunicode}/src/libnu/ducet.c (100%) rename {nunicode => vendor/nunicode}/src/libnu/gen/_ducet.c (100%) rename {nunicode => vendor/nunicode}/src/libnu/gen/_ducet_switch.c (100%) rename {nunicode => vendor/nunicode}/src/libnu/gen/_tofold.c (100%) rename {nunicode => vendor/nunicode}/src/libnu/gen/_tolower.c (100%) rename {nunicode => vendor/nunicode}/src/libnu/gen/_tounaccent.c (100%) rename {nunicode => vendor/nunicode}/src/libnu/gen/_toupper.c (100%) rename {nunicode => vendor/nunicode}/src/libnu/strcoll.c (100%) rename {nunicode => vendor/nunicode}/src/libnu/strings.c (100%) rename {nunicode => vendor/nunicode}/src/libnu/tofold.c (100%) rename {nunicode => vendor/nunicode}/src/libnu/tolower.c (100%) rename {nunicode => vendor/nunicode}/src/libnu/tounaccent.c (100%) rename {nunicode => vendor/nunicode}/src/libnu/toupper.c (100%) rename {nunicode => vendor/nunicode}/src/libnu/utf8.c (100%) rename {nunicode => vendor/nunicode}/version.txt (100%) diff --git a/cmake/nunicode.cmake b/cmake/nunicode.cmake index aedff2f805c..3b9789e5bf3 100644 --- a/cmake/nunicode.cmake +++ b/cmake/nunicode.cmake @@ -1,38 +1,23 @@ -macro(mbgl_nunicode_core) - target_sources(mbgl-core - PRIVATE nunicode/include/libnu/casemap.h - PRIVATE nunicode/include/libnu/casemap_internal.h - PRIVATE nunicode/include/libnu/config.h - PRIVATE nunicode/include/libnu/defines.h - PRIVATE nunicode/include/libnu/ducet.h - PRIVATE nunicode/include/libnu/libnu.h - PRIVATE nunicode/include/libnu/mph.h - PRIVATE nunicode/include/libnu/strcoll.h - PRIVATE nunicode/include/libnu/strcoll_internal.h - PRIVATE nunicode/include/libnu/strings.h - PRIVATE nunicode/include/libnu/udb.h - PRIVATE nunicode/include/libnu/unaccent.h - PRIVATE nunicode/include/libnu/utf8.h - PRIVATE nunicode/include/libnu/utf8_internal.h +add_library(nunicode STATIC + vendor/nunicode/src/libnu/ducet.c + vendor/nunicode/src/libnu/strcoll.c + vendor/nunicode/src/libnu/strings.c + vendor/nunicode/src/libnu/tolower.c + vendor/nunicode/src/libnu/tounaccent.c + vendor/nunicode/src/libnu/toupper.c + vendor/nunicode/src/libnu/tofold.c + vendor/nunicode/src/libnu/utf8.c +) - PRIVATE nunicode/src/libnu/ducet.c - PRIVATE nunicode/src/libnu/strcoll.c - PRIVATE nunicode/src/libnu/strings.c - PRIVATE nunicode/src/libnu/tolower.c - PRIVATE nunicode/src/libnu/tounaccent.c - PRIVATE nunicode/src/libnu/toupper.c - PRIVATE nunicode/src/libnu/tofold.c - PRIVATE nunicode/src/libnu/utf8.c - ) +target_include_directories(nunicode + PUBLIC vendor/nunicode/include +) - target_include_directories(mbgl-core - PRIVATE nunicode/include - ) +target_compile_definitions(nunicode + PUBLIC "-DNU_WITH_UTF8" + PUBLIC "-DNU_WITH_Z_COLLATION" + PUBLIC "-DNU_WITH_CASEMAP" + PUBLIC "-DNU_WITH_UNACCENT" +) - target_compile_definitions(mbgl-core - PRIVATE "-DNU_WITH_UTF8" - PRIVATE "-DNU_WITH_Z_COLLATION" - PRIVATE "-DNU_WITH_CASEMAP" - PRIVATE "-DNU_WITH_UNACCENT" - ) -endmacro() +create_source_groups(nunicode) diff --git a/platform/android/config.cmake b/platform/android/config.cmake index e426ed009b9..885828ccc7e 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -85,7 +85,7 @@ macro(mbgl_platform_core) PRIVATE platform/android ) - mbgl_nunicode_core() + target_link_libraries(mbgl-core PRIVATE nunicode) target_add_mason_package(mbgl-core PUBLIC geojson) target_add_mason_package(mbgl-core PUBLIC jni.hpp) diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index 5929e252dbb..d7909f92b98 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -89,7 +89,7 @@ macro(mbgl_platform_core) PRIVATE platform/linux ) - mbgl_nunicode_core() + target_link_libraries(mbgl-core PRIVATE nunicode) target_add_mason_package(mbgl-core PUBLIC libpng) target_add_mason_package(mbgl-core PUBLIC libjpeg-turbo) diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake index 9e06843be73..533250954eb 100644 --- a/platform/qt/config.cmake +++ b/platform/qt/config.cmake @@ -50,7 +50,7 @@ macro(mbgl_platform_core) target_sources(mbgl-core PRIVATE platform/qt/src/bidi.cpp) endif() - mbgl_nunicode_core() + target_link_libraries(mbgl-core PRIVATE nunicode) target_sources(mbgl-core PRIVATE platform/default/collator.cpp) target_sources(mbgl-core PRIVATE platform/default/local_glyph_rasterizer.cpp) diff --git a/nunicode/LICENSE b/vendor/nunicode/LICENSE similarity index 100% rename from nunicode/LICENSE rename to vendor/nunicode/LICENSE diff --git a/nunicode/files.txt b/vendor/nunicode/files.txt similarity index 100% rename from nunicode/files.txt rename to vendor/nunicode/files.txt diff --git a/nunicode/include/libnu/casemap.h b/vendor/nunicode/include/libnu/casemap.h similarity index 100% rename from nunicode/include/libnu/casemap.h rename to vendor/nunicode/include/libnu/casemap.h diff --git a/nunicode/include/libnu/casemap_internal.h b/vendor/nunicode/include/libnu/casemap_internal.h similarity index 100% rename from nunicode/include/libnu/casemap_internal.h rename to vendor/nunicode/include/libnu/casemap_internal.h diff --git a/nunicode/include/libnu/config.h b/vendor/nunicode/include/libnu/config.h similarity index 100% rename from nunicode/include/libnu/config.h rename to vendor/nunicode/include/libnu/config.h diff --git a/nunicode/include/libnu/defines.h b/vendor/nunicode/include/libnu/defines.h similarity index 100% rename from nunicode/include/libnu/defines.h rename to vendor/nunicode/include/libnu/defines.h diff --git a/nunicode/include/libnu/ducet.h b/vendor/nunicode/include/libnu/ducet.h similarity index 100% rename from nunicode/include/libnu/ducet.h rename to vendor/nunicode/include/libnu/ducet.h diff --git a/nunicode/include/libnu/libnu.h b/vendor/nunicode/include/libnu/libnu.h similarity index 100% rename from nunicode/include/libnu/libnu.h rename to vendor/nunicode/include/libnu/libnu.h diff --git a/nunicode/include/libnu/mph.h b/vendor/nunicode/include/libnu/mph.h similarity index 100% rename from nunicode/include/libnu/mph.h rename to vendor/nunicode/include/libnu/mph.h diff --git a/nunicode/include/libnu/strcoll.h b/vendor/nunicode/include/libnu/strcoll.h similarity index 100% rename from nunicode/include/libnu/strcoll.h rename to vendor/nunicode/include/libnu/strcoll.h diff --git a/nunicode/include/libnu/strcoll_internal.h b/vendor/nunicode/include/libnu/strcoll_internal.h similarity index 100% rename from nunicode/include/libnu/strcoll_internal.h rename to vendor/nunicode/include/libnu/strcoll_internal.h diff --git a/nunicode/include/libnu/strings.h b/vendor/nunicode/include/libnu/strings.h similarity index 100% rename from nunicode/include/libnu/strings.h rename to vendor/nunicode/include/libnu/strings.h diff --git a/nunicode/include/libnu/udb.h b/vendor/nunicode/include/libnu/udb.h similarity index 100% rename from nunicode/include/libnu/udb.h rename to vendor/nunicode/include/libnu/udb.h diff --git a/nunicode/include/libnu/unaccent.h b/vendor/nunicode/include/libnu/unaccent.h similarity index 100% rename from nunicode/include/libnu/unaccent.h rename to vendor/nunicode/include/libnu/unaccent.h diff --git a/nunicode/include/libnu/utf8.h b/vendor/nunicode/include/libnu/utf8.h similarity index 100% rename from nunicode/include/libnu/utf8.h rename to vendor/nunicode/include/libnu/utf8.h diff --git a/nunicode/include/libnu/utf8_internal.h b/vendor/nunicode/include/libnu/utf8_internal.h similarity index 100% rename from nunicode/include/libnu/utf8_internal.h rename to vendor/nunicode/include/libnu/utf8_internal.h diff --git a/nunicode/src/libnu/ducet.c b/vendor/nunicode/src/libnu/ducet.c similarity index 100% rename from nunicode/src/libnu/ducet.c rename to vendor/nunicode/src/libnu/ducet.c diff --git a/nunicode/src/libnu/gen/_ducet.c b/vendor/nunicode/src/libnu/gen/_ducet.c similarity index 100% rename from nunicode/src/libnu/gen/_ducet.c rename to vendor/nunicode/src/libnu/gen/_ducet.c diff --git a/nunicode/src/libnu/gen/_ducet_switch.c b/vendor/nunicode/src/libnu/gen/_ducet_switch.c similarity index 100% rename from nunicode/src/libnu/gen/_ducet_switch.c rename to vendor/nunicode/src/libnu/gen/_ducet_switch.c diff --git a/nunicode/src/libnu/gen/_tofold.c b/vendor/nunicode/src/libnu/gen/_tofold.c similarity index 100% rename from nunicode/src/libnu/gen/_tofold.c rename to vendor/nunicode/src/libnu/gen/_tofold.c diff --git a/nunicode/src/libnu/gen/_tolower.c b/vendor/nunicode/src/libnu/gen/_tolower.c similarity index 100% rename from nunicode/src/libnu/gen/_tolower.c rename to vendor/nunicode/src/libnu/gen/_tolower.c diff --git a/nunicode/src/libnu/gen/_tounaccent.c b/vendor/nunicode/src/libnu/gen/_tounaccent.c similarity index 100% rename from nunicode/src/libnu/gen/_tounaccent.c rename to vendor/nunicode/src/libnu/gen/_tounaccent.c diff --git a/nunicode/src/libnu/gen/_toupper.c b/vendor/nunicode/src/libnu/gen/_toupper.c similarity index 100% rename from nunicode/src/libnu/gen/_toupper.c rename to vendor/nunicode/src/libnu/gen/_toupper.c diff --git a/nunicode/src/libnu/strcoll.c b/vendor/nunicode/src/libnu/strcoll.c similarity index 100% rename from nunicode/src/libnu/strcoll.c rename to vendor/nunicode/src/libnu/strcoll.c diff --git a/nunicode/src/libnu/strings.c b/vendor/nunicode/src/libnu/strings.c similarity index 100% rename from nunicode/src/libnu/strings.c rename to vendor/nunicode/src/libnu/strings.c diff --git a/nunicode/src/libnu/tofold.c b/vendor/nunicode/src/libnu/tofold.c similarity index 100% rename from nunicode/src/libnu/tofold.c rename to vendor/nunicode/src/libnu/tofold.c diff --git a/nunicode/src/libnu/tolower.c b/vendor/nunicode/src/libnu/tolower.c similarity index 100% rename from nunicode/src/libnu/tolower.c rename to vendor/nunicode/src/libnu/tolower.c diff --git a/nunicode/src/libnu/tounaccent.c b/vendor/nunicode/src/libnu/tounaccent.c similarity index 100% rename from nunicode/src/libnu/tounaccent.c rename to vendor/nunicode/src/libnu/tounaccent.c diff --git a/nunicode/src/libnu/toupper.c b/vendor/nunicode/src/libnu/toupper.c similarity index 100% rename from nunicode/src/libnu/toupper.c rename to vendor/nunicode/src/libnu/toupper.c diff --git a/nunicode/src/libnu/utf8.c b/vendor/nunicode/src/libnu/utf8.c similarity index 100% rename from nunicode/src/libnu/utf8.c rename to vendor/nunicode/src/libnu/utf8.c diff --git a/nunicode/version.txt b/vendor/nunicode/version.txt similarity index 100% rename from nunicode/version.txt rename to vendor/nunicode/version.txt