[core] Move nunicode into "vendor" directory

Switch nunicode.cmake to build nunicode as library instead of adding to mbgl-core as a macro.
mapbox · Jun 29, 2018 · cc98bfc · cc98bfc
1 parent 4f84b7e
commit cc98bfc
Show file tree

Hide file tree

Showing 35 changed files with 23 additions and 38 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 → vendor/nunicode/LICENSE b/nunicode/LICENSE → vendor/nunicode/LICENSE
diff --git a/nunicode/files.txt → vendor/nunicode/files.txt b/nunicode/files.txt → vendor/nunicode/files.txt
diff --git a/nunicode/include/libnu/casemap.h → vendor/nunicode/include/libnu/casemap.h b/nunicode/include/libnu/casemap.h → vendor/nunicode/include/libnu/casemap.h
diff --git a/nunicode/include/libnu/casemap_internal.h → ...nunicode/include/libnu/casemap_internal.h b/nunicode/include/libnu/casemap_internal.h → ...nunicode/include/libnu/casemap_internal.h
diff --git a/nunicode/include/libnu/config.h → vendor/nunicode/include/libnu/config.h b/nunicode/include/libnu/config.h → vendor/nunicode/include/libnu/config.h
diff --git a/nunicode/include/libnu/defines.h → vendor/nunicode/include/libnu/defines.h b/nunicode/include/libnu/defines.h → vendor/nunicode/include/libnu/defines.h
diff --git a/nunicode/include/libnu/ducet.h → vendor/nunicode/include/libnu/ducet.h b/nunicode/include/libnu/ducet.h → vendor/nunicode/include/libnu/ducet.h
diff --git a/nunicode/include/libnu/libnu.h → vendor/nunicode/include/libnu/libnu.h b/nunicode/include/libnu/libnu.h → vendor/nunicode/include/libnu/libnu.h
diff --git a/nunicode/include/libnu/mph.h → vendor/nunicode/include/libnu/mph.h b/nunicode/include/libnu/mph.h → vendor/nunicode/include/libnu/mph.h
diff --git a/nunicode/include/libnu/strcoll.h → vendor/nunicode/include/libnu/strcoll.h b/nunicode/include/libnu/strcoll.h → vendor/nunicode/include/libnu/strcoll.h
diff --git a/nunicode/include/libnu/strcoll_internal.h → ...nunicode/include/libnu/strcoll_internal.h b/nunicode/include/libnu/strcoll_internal.h → ...nunicode/include/libnu/strcoll_internal.h
diff --git a/nunicode/include/libnu/strings.h → vendor/nunicode/include/libnu/strings.h b/nunicode/include/libnu/strings.h → vendor/nunicode/include/libnu/strings.h
diff --git a/nunicode/include/libnu/udb.h → vendor/nunicode/include/libnu/udb.h b/nunicode/include/libnu/udb.h → vendor/nunicode/include/libnu/udb.h
diff --git a/nunicode/include/libnu/unaccent.h → vendor/nunicode/include/libnu/unaccent.h b/nunicode/include/libnu/unaccent.h → vendor/nunicode/include/libnu/unaccent.h
diff --git a/nunicode/include/libnu/utf8.h → vendor/nunicode/include/libnu/utf8.h b/nunicode/include/libnu/utf8.h → vendor/nunicode/include/libnu/utf8.h
diff --git a/nunicode/include/libnu/utf8_internal.h → ...or/nunicode/include/libnu/utf8_internal.h b/nunicode/include/libnu/utf8_internal.h → ...or/nunicode/include/libnu/utf8_internal.h
diff --git a/nunicode/src/libnu/ducet.c → vendor/nunicode/src/libnu/ducet.c b/nunicode/src/libnu/ducet.c → vendor/nunicode/src/libnu/ducet.c
diff --git a/nunicode/src/libnu/gen/_ducet.c → vendor/nunicode/src/libnu/gen/_ducet.c b/nunicode/src/libnu/gen/_ducet.c → vendor/nunicode/src/libnu/gen/_ducet.c
diff --git a/nunicode/src/libnu/gen/_ducet_switch.c → ...or/nunicode/src/libnu/gen/_ducet_switch.c b/nunicode/src/libnu/gen/_ducet_switch.c → ...or/nunicode/src/libnu/gen/_ducet_switch.c
diff --git a/nunicode/src/libnu/gen/_tofold.c → vendor/nunicode/src/libnu/gen/_tofold.c b/nunicode/src/libnu/gen/_tofold.c → vendor/nunicode/src/libnu/gen/_tofold.c
diff --git a/nunicode/src/libnu/gen/_tolower.c → vendor/nunicode/src/libnu/gen/_tolower.c b/nunicode/src/libnu/gen/_tolower.c → vendor/nunicode/src/libnu/gen/_tolower.c
diff --git a/nunicode/src/libnu/gen/_tounaccent.c → vendor/nunicode/src/libnu/gen/_tounaccent.c b/nunicode/src/libnu/gen/_tounaccent.c → vendor/nunicode/src/libnu/gen/_tounaccent.c
diff --git a/nunicode/src/libnu/gen/_toupper.c → vendor/nunicode/src/libnu/gen/_toupper.c b/nunicode/src/libnu/gen/_toupper.c → vendor/nunicode/src/libnu/gen/_toupper.c
diff --git a/nunicode/src/libnu/strcoll.c → vendor/nunicode/src/libnu/strcoll.c b/nunicode/src/libnu/strcoll.c → vendor/nunicode/src/libnu/strcoll.c
diff --git a/nunicode/src/libnu/strings.c → vendor/nunicode/src/libnu/strings.c b/nunicode/src/libnu/strings.c → vendor/nunicode/src/libnu/strings.c
diff --git a/nunicode/src/libnu/tofold.c → vendor/nunicode/src/libnu/tofold.c b/nunicode/src/libnu/tofold.c → vendor/nunicode/src/libnu/tofold.c
diff --git a/nunicode/src/libnu/tolower.c → vendor/nunicode/src/libnu/tolower.c b/nunicode/src/libnu/tolower.c → vendor/nunicode/src/libnu/tolower.c
diff --git a/nunicode/src/libnu/tounaccent.c → vendor/nunicode/src/libnu/tounaccent.c b/nunicode/src/libnu/tounaccent.c → vendor/nunicode/src/libnu/tounaccent.c
diff --git a/nunicode/src/libnu/toupper.c → vendor/nunicode/src/libnu/toupper.c b/nunicode/src/libnu/toupper.c → vendor/nunicode/src/libnu/toupper.c
diff --git a/nunicode/src/libnu/utf8.c → vendor/nunicode/src/libnu/utf8.c b/nunicode/src/libnu/utf8.c → vendor/nunicode/src/libnu/utf8.c
diff --git a/nunicode/version.txt → vendor/nunicode/version.txt b/nunicode/version.txt → vendor/nunicode/version.txt