Skip to content

draft: Remove vendoring freetype and zlib on Windows #1636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mjcarroll wants to merge 3 commits into
base: rolling
Choose a base branch
from
Draft

draft: Remove vendoring freetype and zlib on Windows #1636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16a3a14
Remove vendoring freetype and zlib
mjcarroll Dec 3, 2025
fdc470e
Suggestions (#1638)
ahcorde Dec 5, 2025
f8130a4
Merge remote-tracking branch 'origin/rolling' into mjcarroll/remove_w…
ahcorde Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 0 additions & 49 deletions rviz_ogre_vendor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,45 +6,6 @@ find_package(ament_cmake_vendor_package REQUIRED)

option(RVIZ_OGRE_VENDOR_MANGLE_NAME_OF_LIBRARIES_USED_BY_RVIZ "If enabled, append a unique name to OgreMain, OgreOverlay and OgreGLSupport." FALSE)

if(WIN32)
set(FREETYPE_C_FLAGS "${CMAKE_C_FLAGS}")
if(MSVC)
set(FREETYPE_C_FLAGS "/wd4244 ${FREETYPE_C_FLAGS}")
set(FREETYPE_C_FLAGS "/wd4267 ${FREETYPE_C_FLAGS}")
set(FREETYPE_C_FLAGS "/wd4312 ${FREETYPE_C_FLAGS}")
set(FREETYPE_C_FLAGS "/wd4996 ${FREETYPE_C_FLAGS}")
endif()

ament_vendor(freetype_vendor
VCS_URL https://github.com/freetype/freetype.git
VCS_VERSION VER-2-13-2
CMAKE_ARGS
-DFT_DISABLE_ZLIB:BOOL=ON
-DFT_DISABLE_BZIP2:BOOL=ON
-DFT_DISABLE_PNG:BOOL=ON
-DFT_DISABLE_HARFBUZZ:BOOL=ON
"-DCMAKE_C_FLAGS=${FREETYPE_C_FLAGS}"
)

set(ZLIB_C_FLAGS "${ZLIB_C_FLAGS}")
if(MSVC)
set(ZLIB_C_FLAGS "/wd4267 ${ZLIB_C_FLAGS}")
endif()

ament_vendor(zlib_vendor
VCS_URL https://github.com/madler/zlib.git
VCS_VERSION v1.3
CMAKE_ARGS
# zlib doesn't use CMAKE_INSTALL_PREFIX correctly, so we need to override
-DINSTALL_BIN_DIR=<INSTALL_DIR>/bin
-DINSTALL_LIB_DIR=<INSTALL_DIR>/lib
-DINSTALL_INC_DIR=<INSTALL_DIR>/include
-DINSTALL_MAN_DIR=<INSTALL_DIR>/share/man
-DINSTALL_PKGCONFIG_DIR=<INSTALL_DIR>/share/pkgconfig
"-DCMAKE_C_FLAGS=${ZLIB_C_FLAGS}"
)
endif()

set(OGRE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
if(MSVC)
set(OGRE_CXX_FLAGS "/wd4101 ${OGRE_CXX_FLAGS}")
Expand Down Expand Up @@ -112,16 +73,6 @@ ament_vendor(ogre_vendor
PATCHES patches
)

if(TARGET ogre_vendor)
if(TARGET freetype_vendor)
ExternalProject_Add_StepDependencies(ogre_vendor configure freetype_vendor)
endif()

if(TARGET zlib_vendor)
ExternalProject_Add_StepDependencies(ogre_vendor configure zlib_vendor)
endif()
endif()

if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED)
ament_lint_auto_find_test_dependencies()
Expand Down
13 changes: 1 addition & 12 deletions rviz_ogre_vendor/rviz_ogre_vendor-extras.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ else()
endif()
message(STATUS "Setting OGRE_DIR to: '${OGRE_DIR}'")

set(FREETYPE_HOME "${rviz_ogre_vendor_DIR}/../../../opt/rviz_ogre_vendor")
set(ZLIB_HOME "${rviz_ogre_vendor_DIR}/../../../opt/rviz_ogre_vendor")

find_package(OGRE REQUIRED NO_SYSTEM_ENVIRONMENT_PATH)
message(STATUS "OGRE_LIBRARIES: ${OGRE_LIBRARIES}")
message(STATUS "OGRE_LIBRARY_DIRS: ${OGRE_LIBRARY_DIRS}")
Expand Down Expand Up @@ -103,15 +100,7 @@ foreach(_lib IN LISTS OGRE_LIBRARIES)
message(FATAL_ERROR "Could not find freetype package")
endif()

if(WIN32)
if(_ogre_main_static_library_debug_abs)
set(ZLIB_LIBRARIES "${ZLIB_HOME}/lib/zlibstaticd.lib")
else()
set(ZLIB_LIBRARIES "${ZLIB_HOME}/lib/zlibstatic.lib")
endif()
else()
find_package(ZLIB REQUIRED)
endif()
find_package(ZLIB REQUIRED)

if(NOT ZLIB_LIBRARIES)
message(FATAL_ERROR "Could not find zlib library")
Expand Down