mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 18:49:00 +08:00
3a26eb3dc4
* [fontconfig] update fontconfig * [libiconv] update to make * [gettext] update to make * [vcpkg_configure_make] Changes considering pure configure ports without the requirement to run autoconfig * [fontconfig] make it work on windows * Remove install of unofficial cmake config * add function get_cmake_vars * fine tuning. * apply to make based ports. * add log suffix on not windows platforms * fix c&p error * add previous LINK env * setup env on windows and extract cpp flags correctly. * update glib and libxml2 * fix windows regressions * Apply suggestions from code review * add windres wrapper to invoke RC. * remove wrong fi * fix libintl. * try fixing uwp * other things to update * exiv2 fix * libtool does not like -RTC1 * pass the /RTC<x> flag directly to the compiler * trust cmake instead of adding extra flags * fix expat * fix iconv wrapper install * change fontconfig intl linkage. * add appcontainer back in which is required for UWP. Why is this not in the cmake flags? * fix pkg-config in vcpkg_configure_make * fix json-c pkg-config installation * remove remnoved config * comment out debug messages + bit of tuning * finally fontconfig * comment debug messages * expat apply extra patches. * Switch back to -E instead of -EP in cpp * commit changes from fontconfig PR * [expat] fix expat details * Apply suggestions from code review Co-authored-by: nicole mazzuca <mazzucan@outlook.com> * cleanup docs * update osx pipeline so that fontconfig actually builds * fix expat the lazy way by using a higher commit than release * fix a barage of regressions due to the use of unofficial targets * [expat] use a higher commit hash with a better stabilized cmake build * forgot freexl regression * more unofficial fixes * fix downstream expat usage * fix wxwidgets * fix gcdm regression * [vtk] fix the regression due to expat * add uwp cl flags back in. Somehow those are not set by cmake * add a few other configure options for full gettext build * fix cmake regression * fix a few regressions * fix static gettext build * fix gettext static * fix libxml2 wrapper for cmake * some more regressions fixes * add conversion from somelib.lib to -lsomelib * add a few option to libiconv. * get logs from CI * add missing ar-lib wrapper * add missing ar-lib wrapper * add fatal error to gettext * remove uuid from the list of LIBS since it seems to not exist in CI? * small but important regex correction * fix regex and add debug message for libs * remove error and only build libintl. * add uuid dependency to fontconfig in qt5-base * osx install gettext for autopoint * fix io2d regression by saying the port is broken ..... (which it is; upstream needs to learn proper cmake) * restore the old libxml2 wrapper with minor modifications * fix xmlsec regression * install wrapper correctly * try actual fixing io2d * improve iconv wrapper * add latest changes from update_fontconfig PR * Apply suggestions from code review first set which don't need special attention Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * Apply suggestions from code review one more simple change Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * [x264] set env AS * fix bugs due to refactor * use subpath everywhere * apply changes from CR * fix fontconfig build. * only change libs in static builds * remove unnecessary lines 41 & 44 * remove flag transformation * reintroduce the flag / to - transformation for MSVC * trying to figure out autopoint issue. using wrong (windows) find.exe instead of msys * add correct working_dir to subpath * escape stupid env paths. * fix typo * add findutils remove debug messages * add error if libtool chokes * add file to msys * pass lt_cv_deplibs_check_method=pass_all on windows (couldn't get file.exe to work so that libtool correctly ids the passed libs) * add bzip2 to msys * reenable libtool check. Lets see if CI agrees * unbreak linux try to figure out where uuid should be on windows. * add -L flag and help libtool ? * try to get ci to find uuid. * try to use cygpath * update controls * cleanup merge mistakes * correct merge issues * determine cmake vars if not done before. * move adding of -l earlier * more merge cleanup * fix uwp builds by not transforming libs * fix patches in io2d * fix xz download error * apply code review changes manually * fix the typos left behind in CR Co-authored-by: nicole mazzuca <mazzucan@outlook.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
106 lines
3.7 KiB
Diff
106 lines
3.7 KiB
Diff
diff --git a/src/training/CMakeLists.txt b/src/training/CMakeLists.txt
|
|
index 8fd96a9..186341e 100644
|
|
--- a/src/training/CMakeLists.txt
|
|
+++ b/src/training/CMakeLists.txt
|
|
@@ -52,7 +52,7 @@ endif()
|
|
# experimental
|
|
|
|
if (NOT CPPAN_BUILD AND NOT SW_BUILD)
|
|
- find_package(ICU 52.1 COMPONENTS uc i18n)
|
|
+ find_package(ICU 52.1 REQUIRED COMPONENTS i18n uc)
|
|
endif()
|
|
|
|
########################################
|
|
@@ -187,6 +187,9 @@ set(unicharset_training_src
|
|
|
|
)
|
|
add_library (unicharset_training ${unicharset_training_src})
|
|
+if(UNIX)
|
|
+ list(APPEND ICU_LIBRARIES ${CMAKE_DL_LIBS})
|
|
+endif()
|
|
if (CPPAN_BUILD)
|
|
target_link_libraries (unicharset_training common_training pvt.cppan.demo.unicode.icu.i18n)
|
|
elseif (SW_BUILD)
|
|
@@ -253,16 +256,27 @@ if (NOT CPPAN_BUILD AND NOT SW_BUILD)
|
|
find_package(PkgConfig)
|
|
endif()
|
|
|
|
-if (PKG_CONFIG_FOUND OR CPPAN_BUILD OR SW_BUILD)
|
|
-
|
|
-if (PKG_CONFIG_FOUND)
|
|
-pkg_check_modules(Pango REQUIRED pango>=1.22.0)
|
|
-pkg_check_modules(Cairo REQUIRED cairo)
|
|
-pkg_check_modules(PangoFt2 REQUIRED pangoft2)
|
|
-pkg_check_modules(PangoCairo REQUIRED pangocairo)
|
|
-pkg_check_modules(FontConfig REQUIRED fontconfig)
|
|
+find_package(unofficial-cairo CONFIG REQUIRED)
|
|
+find_package(unofficial-glib CONFIG REQUIRED)
|
|
+find_package(Intl CONFIG REQUIRED)
|
|
+find_package(Fontconfig REQUIRED)
|
|
+find_package(Freetype REQUIRED)
|
|
+if(UNIX OR BUILD_SHARED_LIBS)
|
|
+ find_package(harfbuzz CONFIG REQUIRED)
|
|
endif()
|
|
|
|
+find_library(Pango_LIBRARY_RELEASE NAMES pango-1.0)
|
|
+find_library(Pango_LIBRARY_DEBUG NAMES pango-1.0)
|
|
+select_library_configurations(Pango)
|
|
+
|
|
+find_library(PangoFt2_LIBRARY_RELEASE NAMES pangoft2-1.0)
|
|
+find_library(PangoFt2_LIBRARY_DEBUG NAMES pangoft2-1.0)
|
|
+select_library_configurations(PangoFt2)
|
|
+
|
|
+find_library(PangoCairo_LIBRARY_RELEASE NAMES pangocairo-1.0)
|
|
+find_library(PangoCairo_LIBRARY_DEBUG NAMES pangocairo-1.0)
|
|
+select_library_configurations(PangoCairo)
|
|
+
|
|
set(text2image_src
|
|
text2image.cpp
|
|
boxchar.cpp
|
|
@@ -285,16 +299,34 @@ set(text2image_src
|
|
|
|
add_executable (text2image ${text2image_src})
|
|
target_link_libraries (text2image unicharset_training)
|
|
-if (PKG_CONFIG_FOUND)
|
|
+
|
|
target_include_directories (text2image BEFORE PRIVATE ${Cairo_INCLUDE_DIRS} ${Pango_INCLUDE_DIRS})
|
|
target_compile_definitions (text2image PRIVATE -DPANGO_ENABLE_ENGINE)
|
|
-target_link_libraries (text2image
|
|
+if(UNIX OR BUILD_SHARED_LIBS)
|
|
+ target_link_libraries (text2image
|
|
+ ${PangoCairo_LIBRARIES}
|
|
+ ${PangoFt2_LIBRARIES}
|
|
${Pango_LIBRARIES}
|
|
${Cairo_LIBRARIES}
|
|
+ harfbuzz::harfbuzz
|
|
+ Freetype::Freetype
|
|
+ unofficial::glib::gio unofficial::glib::glib unofficial::glib::gmodule unofficial::glib::gobject
|
|
+ unofficial::cairo::cairo unofficial::cairo::cairo-gobject
|
|
+ ${Intl_LIBRARIES}
|
|
+ Fontconfig::Fontconfig
|
|
+)
|
|
+else()
|
|
+ target_link_libraries (text2image
|
|
${PangoCairo_LIBRARIES}
|
|
${PangoFt2_LIBRARIES}
|
|
${FontConfig_LIBRARIES}
|
|
-)
|
|
+ ${Pango_LIBRARIES}
|
|
+ Freetype::Freetype
|
|
+ unofficial::glib::gio unofficial::glib::glib unofficial::glib::gmodule unofficial::glib::gobject
|
|
+ unofficial::cairo::cairo unofficial::cairo::cairo-gobject
|
|
+ ${Intl_LIBRARIES}
|
|
+ Fontconfig::Fontconfig
|
|
+ )
|
|
endif()
|
|
if (CPPAN_BUILD)
|
|
target_link_libraries (text2image pvt.cppan.demo.gnome.pango.pangocairo)
|
|
@@ -302,7 +334,6 @@ endif()
|
|
project_group (text2image "Training Tools")
|
|
install (TARGETS text2image RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
|
|
|
|
-endif()
|
|
endif(ICU_FOUND)
|
|
|
|
###############################################################################
|