adobe-type-tools · LecrisUT · Jun 3, 2025 · Jun 4, 2025 · Jun 7, 2025 · Jun 7, 2025
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,38 +42,8 @@ set(ANTLR4_WITH_STATIC_CRT OFF)
 # This is a more recent commit than 4.13.2 that addresses a missing
 # include directive needed in more recent Visual Studio releases
 set(ANTLR4_TAG df4d68c09cdef73e023b8838a8bc7ca4dff1d1de)
-include(ExternalAntlr4Cpp)
-
-
-if (DEFINED ENV{FORCE_BUILD_LIBXML2})
-    set(BUILD_STATIC_LIBXML2 TRUE)
-else()
-    FIND_PACKAGE(LibXml2)
-    if (${LibXml2_FOUND})
-        set(BUILD_STATIC_LIBXML2 FALSE)
-    elseif (DEFINED ENV{FORCE_SYSTEM_LIBXML2})
-        message(FATAL_ERROR "FORCE_SYSTEM_LIBXML2 set but LibXML2 not found")
-    else()
-        set(BUILD_STATIC_LIBXML2 TRUE)
-    endif()
-endif()
-
-if (${BUILD_STATIC_LIBXML2})
-    message(STATUS "LibXML2 not found or overridden -- will download and statically link")
-    set(LIBXML2_TAG tags/v2.9.13)
-    include(ExternalLibXML2)
-    include_directories(${LIBXML2_STATIC_INCLUDE_DIR})
-    set(NEED_LIBXML2_DEPEND TRUE)
-    if (WIN32)
-        set(CHOSEN_LIBXML2_LIBRARY ${LIBXML2_WIN_LIBRARIES})
-    else()
-        set(CHOSEN_LIBXML2_LIBRARY ${LIBXML2_NONWIN_LIBRARIES})
-    endif()
-else()
-    include_directories(${LIBXML2_INCLUDE_DIR})
-    set(NEED_LIBXML2_DEPEND FALSE)
-    set(CHOSEN_LIBXML2_LIBRARY ${LIBXML2_LIBRARY})
-endif()
+set(LIBXML2_TAG tags/v2.9.13)
+add_subdirectory(third_party)
 
 # sanitizer support
 # work around https://github.com/pypa/setuptools/issues/1928 with environment

diff --git a/c/makeotf/lib/cffread/CMakeLists.txt b/c/makeotf/lib/cffread/CMakeLists.txt
@@ -2,12 +2,8 @@ add_library(makeotf_cffread STATIC cffread.c)
 
 target_include_directories(makeotf_cffread PRIVATE AFTER $<$<COMPILE_LANGUAGE:CXX>:${ANTLR4_INCLUDE_DIRS}>)
 
-target_link_libraries(makeotf_cffread PUBLIC ${CHOSEN_LIBXML2_LIBRARY})
+target_link_libraries(makeotf_cffread PUBLIC LibXml2::LibXml2)
 
-if (${NEED_LIBXML2_DEPEND})
-    add_dependencies(makeotf_cffread ${LIBXML2_TARGET})
-endif()
-
-target_link_libraries(makeotf_cffread PUBLIC antlr4_static)
+target_link_libraries(makeotf_cffread PUBLIC afdko::antlr4)
 
 target_compile_definitions(makeotf_cffread PRIVATE $<$<CONFIG:Debug>:CFF_DEBUG=1> CFF_T13_SUPPORT=0)
diff --git a/c/makeotf/lib/hotconv/CMakeLists.txt b/c/makeotf/lib/hotconv/CMakeLists.txt
@@ -70,13 +70,9 @@ add_library(hotconv STATIC
 set_property(TARGET hotconv PROPERTY C_STANDARD 99)
 set_property(TARGET hotconv PROPERTY CXX_STANDARD 17)
 target_include_directories(hotconv PRIVATE AFTER $<$<COMPILE_LANGUAGE:CXX>:${ANTLR4_INCLUDE_DIRS}>)
-target_link_libraries(hotconv PUBLIC antlr4_static)
+target_link_libraries(hotconv PUBLIC afdko::antlr4)
 
-target_link_libraries(hotconv PUBLIC ${CHOSEN_LIBXML2_LIBRARY})
-
-if (${NEED_LIBXML2_DEPEND})
-    add_dependencies(hotconv ${LIBXML2_TARGET})
-endif()
+target_link_libraries(hotconv PUBLIC LibXml2::LibXml2)
 
 if ( CMAKE_COMPILER_IS_GNUCC )
     target_compile_options(hotconv PRIVATE -Wall -Wno-attributes)

diff --git a/c/makeotf/lib/pstoken/CMakeLists.txt b/c/makeotf/lib/pstoken/CMakeLists.txt
@@ -1,9 +1,5 @@
 add_library(makeotf_pstoken STATIC pstoken.c)
 
-target_link_libraries(makeotf_pstoken PUBLIC ${CHOSEN_LIBXML2_LIBRARY})
-
-if (${NEED_LIBXML2_DEPEND})
-    add_dependencies(makeotf_pstoken ${LIBXML2_TARGET})
-endif()
+target_link_libraries(makeotf_pstoken PUBLIC LibXml2::LibXml2)
 
 target_compile_definitions(makeotf_pstoken PRIVATE PSTOKEN_DEBUG=1 CFF_DEBUG=1 CFF_T13_SUPPORT=0)
diff --git a/c/makeotf/lib/typecomp/CMakeLists.txt b/c/makeotf/lib/typecomp/CMakeLists.txt
@@ -45,10 +45,7 @@ add_library(typecomp STATIC
     tc.c
 )
 
-target_link_libraries(typecomp PUBLIC ${CHOSEN_LIBXML2_LIBRARY})
-if (${NEED_LIBXML2_DEPEND})
-    add_dependencies(typecomp ${LIBXML2_TARGET})
-endif()
+target_link_libraries(typecomp PUBLIC LibXml2::LibXml2)
 
 target_compile_definitions(typecomp PRIVATE
     TC_HINT_CHECK=1

diff --git a/c/makeotf/source/CMakeLists.txt b/c/makeotf/source/CMakeLists.txt
@@ -27,7 +27,7 @@ if (HAVE_M_LIB)
     target_link_libraries(makeotfexe PRIVATE m)
 endif ()
 
-target_link_libraries(makeotfexe PUBLIC ${CHOSEN_LIBXML2_LIBRARY})
+target_link_libraries(makeotfexe PUBLIC LibXml2::LibXml2)
 
 target_compile_definitions(makeotfexe PRIVATE MAKEOTFLIB_EXPORTS=1)
 

diff --git a/c/mergefonts/source/CMakeLists.txt b/c/mergefonts/source/CMakeLists.txt
@@ -8,7 +8,7 @@ add_executable(mergefonts
 target_include_directories(mergefonts PRIVATE ../../shared/include ../../shared/resource ../../shared/source/tx_shared)
 
 target_link_libraries(mergefonts PUBLIC tx_shared)
-target_link_libraries(mergefonts PUBLIC ${CHOSEN_LIBXML2_LIBRARY})
+target_link_libraries(mergefonts PUBLIC LibXml2::LibXml2)
 
 if (${NEED_LIBXML_DEPEND})
     add_dependencies(mergefonts ${LIBXML2_TARGET})

diff --git a/c/rotatefont/source/CMakeLists.txt b/c/rotatefont/source/CMakeLists.txt
@@ -9,11 +9,6 @@ target_include_directories(rotatefont PRIVATE ../../shared/include ../../shared/
 
 target_link_libraries(rotatefont PUBLIC tx_shared)
 
-target_link_libraries(rotatefont PUBLIC ${CHOSEN_LIBXML2_LIBRARY})
-
-if (${NEED_LIBXML2_DEPEND})
-    add_dependencies(rotatefont ${LIBXML2_TARGET})
-    target_compile_definitions(rotatefont PUBLIC -DLIBXML_STATIC)
-endif()
+target_link_libraries(rotatefont PUBLIC LibXml2::LibXml2)
 
 install(TARGETS rotatefont DESTINATION bin)
diff --git a/c/shared/source/CMakeLists.txt b/c/shared/source/CMakeLists.txt
@@ -3,9 +3,7 @@ include_directories(../include ../resource)
 MACRO(ADD_AFDKOLIB lm)
     file(GLOB sl_sources "${lm}/*")
     add_library(${lm} STATIC ${sl_sources})
-    if(${NEED_LIBXML2_DEPEND})
-        add_dependencies(${lm} ${LIBXML2_TARGET})
-    endif(${NEED_LIBXML2_DEPEND})
+    target_link_libraries(${lm} PRIVATE LibXml2::LibXml2)
 ENDMACRO(ADD_AFDKOLIB)
 
 ADD_AFDKOLIB(absfont)
@@ -47,11 +45,7 @@ target_compile_definitions(t1write PRIVATE $<$<CONFIG:Debug>:T1W_DEBUG=1>)
 target_compile_definitions(ttread PRIVATE $<$<CONFIG:Debug>:TTR_DEBUG=1>)
 target_compile_definitions(tx_shared PRIVATE $<$<CONFIG:Debug>:CFW_DEBUG=1>)
 
-target_link_libraries(tx_shared PUBLIC ${CHOSEN_LIBXML2_LIBRARY})
-
-if (${NEED_LIBXML2_DEPEND})
-    target_compile_definitions(tx_shared PUBLIC -DLIBXML_STATIC)
-endif()
+target_link_libraries(tx_shared PUBLIC LibXml2::LibXml2)
 
 # These libraries are partially ordered
 

diff --git a/c/tx/source/CMakeLists.txt b/c/tx/source/CMakeLists.txt
@@ -8,10 +8,6 @@ add_executable(tx
 target_include_directories(tx PRIVATE ../../shared/include ../../shared/resource ../../shared/source/tx_shared)
 target_link_libraries(tx PUBLIC tx_shared)
 
-target_link_libraries(tx PUBLIC ${CHOSEN_LIBXML2_LIBRARY})
-if (${NEED_LIBXML2_DEPEND})
-    add_dependencies(tx ${LIBXML2_TARGET})
-    target_compile_definitions(tx PUBLIC -DLIBXML_STATIC)
-endif()
+target_link_libraries(tx PUBLIC LibXml2::LibXml2)
 
 install(TARGETS tx DESTINATION bin)
diff --git a/cmake/ExternalAntlr4Cpp.cmake b/cmake/ExternalAntlr4Cpp.cmake
diff --git a/cmake/ExternalLibXML2.cmake b/cmake/ExternalLibXML2.cmake
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(antlr4cpp)
+add_subdirectory(LibXml2)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		add_subdirectory(antlr4cpp)
		add_subdirectory(LibXml2)