Skip to content

CMake warning fixes #43

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

Merged
Capostrophic merged 4 commits into from
Jan 30, 2026
Merged

CMake warning fixes #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
640cf85
Cleanup superfluous overarching NOT ANDROID conditional
a17r Jan 27, 2026
952d59e
FindGTA.cmake: Fix CMake warnings
a17r Jan 29, 2026
89bbe4c
FindPoppler-glib.cmake: Fix CMake warnings
a17r Jan 29, 2026
7634567
FindRSVG.cmake: Fix CMake warnings
a17r Jan 29, 2026
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
4 changes: 1 addition & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ IF (OSG_MAINTAINER)

ENDIF()

IF(NOT ANDROID)
IF(APPLE)

IF(OSG_BUILD_PLATFORM_IPHONE)
Expand Down Expand Up @@ -271,12 +270,11 @@ IF(APPLE)

OPTION(OSG_COMPILE_FRAMEWORKS "compile frameworks instead of dylibs (experimental)" OFF)
SET(OSG_COMPILE_FRAMEWORKS_INSTALL_NAME_DIR "@executable_path/../Frameworks" CACHE STRING "install name dir for compiled frameworks")
ELSE()
ELSEIF(NOT ANDROID)
# Non-Apple: Find OpenGL
FIND_PACKAGE(OpenGL)
FIND_PACKAGE(EGL)
ENDIF()
ENDIF()



Expand Down
13 changes: 4 additions & 9 deletions CMakeModules/FindGTA.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,10 @@
# correspond to the ./configure --prefix=$GTA_DIR
# used in building libgta.

INCLUDE(FindPkgConfig OPTIONAL)

IF(PKG_CONFIG_FOUND)

INCLUDE(FindPkgConfig)

find_package(PkgConfig QUIET)
if(PkgConfig_FOUND)
PKG_CHECK_MODULES(GTA gta)

ENDIF(PKG_CONFIG_FOUND)
endif()

IF(NOT GTA_FOUND)
FIND_PATH(GTA_INCLUDE_DIRS gta/gta.hpp
Expand Down Expand Up @@ -54,4 +49,4 @@ IF(NOT GTA_FOUND)
SET(GTA_FOUND "YES")
ENDIF(GTA_LIBRARY AND GTA_INCLUDE_DIRS)

ENDIF(NOT GTA_FOUND)
ENDIF(NOT GTA_FOUND)
7 changes: 2 additions & 5 deletions CMakeModules/FindPoppler-glib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
#use pkg-config to find various modues
INCLUDE(FindPkgConfig OPTIONAL)

IF(PKG_CONFIG_FOUND)

INCLUDE(FindPkgConfig)
find_package(PkgConfig QUIET)

IF(PkgConfig_FOUND)
PKG_CHECK_MODULES(CAIRO cairo)
PKG_CHECK_MODULES(POPPLER poppler-glib)

Expand Down
7 changes: 2 additions & 5 deletions CMakeModules/FindRSVG.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
#use pkg-config to find various modues
INCLUDE(FindPkgConfig OPTIONAL)

IF(PKG_CONFIG_FOUND)

INCLUDE(FindPkgConfig)
find_package(PkgConfig QUIET)

IF(PkgConfig_FOUND)
#Version 2.35 introduces the rsvg_cleanup function which is used
PKG_CHECK_MODULES(RSVG librsvg-2.0>=2.35)

Expand Down