Skip to content

Commit

Permalink
Remove redundant cruft from FindGLIB2
Browse files Browse the repository at this point in the history
  • Loading branch information
kintel committed Dec 28, 2022
1 parent f50aa88 commit 27496f3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 75 deletions.
48 changes: 2 additions & 46 deletions cmake/Modules/FindGLIB2.cmake
@@ -1,48 +1,10 @@
message(STATUS "running openscad/cmake/Modules/FindGLIB2.cmake ...")

include(PkgConfigTools)
save_pkg_config_env()

# GLIB2 requires pkg-config to build.
# If we are did an OPENSCAD_LIBRARIES dependency build of glib2, we need to
# tell pkg-config to look under OPENSCAD_LIBRARIES dir.
# Otherwise, we need to use the system's pkg-config to find system's glib2
if (NOT $ENV{OPENSCAD_LIBRARIES} STREQUAL "")
if (EXISTS "$ENV{OPENSCAD_LIBRARIES}/include/glib-2.0/glib.h")
message(STATUS "found glib.h under OPENSCAD_LIBRARIES.")
message(STATUS "redirecting pkg-config to look under OPENSCAD_LIBRARIES")
set(ENV{PKG_CONFIG_PATH} "$ENV{OPENSCAD_LIBRARIES}/lib/pkgconfig")
set(ENV{PKG_CONFIG_LIBDIR} "$ENV{OPENSCAD_LIBRARIES}/lib/pkgconfig")
else()
message(STATUS "attempting to find system glib2")
endif()
endif()

find_package(PkgConfig REQUIRED)

pkg_search_module(GLIB2 REQUIRED glib-2.0)
message(STATUS "GLIB2_VERSION ${GLIB2_VERSION}")
#message(STATUS "GLIB2_LIBRARIES ${GLIB2_LIBRARIES}")
message(STATUS "GLIB2_LIBRARY_DIRS ${GLIB2_LIBRARY_DIRS}")
#message(STATUS "GLIB2_LDFLAGS ${GLIB2_LDFLAGS}")
#message(STATUS "GLIB2_LDFLAGS_OTHER ${GLIB2_LDFLAGS_OTHER}")
#message(STATUS "GLIB2_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS}")
message(STATUS "GLIB2_INCLUDE_DIRS:")
foreach(glib2incdir ${GLIB2_INCLUDE_DIRS})
message(STATUS " " ${glib2incdir})
endforeach()
#message(STATUS "GLIB2_CFLAGS ${GLIB2_CFLAGS}")
#message(STATUS "GLIB2_CFLAGS_OTHER ${GLIB2_CFLAGS_OTHER}")
message(STATUS "GLIB2_LIBDIR ${GLIB2_LIBDIR}")

find_package(PkgConfig REQUIRED QUIET)

pkg_search_module(GLIB2 glib-2.0)
set(GLIB2_DEFINITIONS ${GLIB2_CFLAGS_OTHER})
#message(STATUS "GLIB2_DEFINITIONS ${GLIB2_DEFINITIONS}")

set(GLIB2_LIBRARY_NAMES ${GLIB2_LIBRARIES})
set(GLIB2_LIBRARIES "")
foreach(GLIB2_LIB ${GLIB2_LIBRARY_NAMES})
# message(STATUS "lib: ${GLIB2_LIB}")
set(TMP TMP-NOTFOUND)
find_library(TMP NAMES ${GLIB2_LIB}
PATHS ${GLIB2_LIBRARY_DIRS}
Expand All @@ -52,9 +14,3 @@ foreach(GLIB2_LIB ${GLIB2_LIBRARY_NAMES})
list(APPEND GLIB2_LIBRARIES "${TMP}")
endif()
endforeach()
message(STATUS "GLIB2_LIBRARIES:")
foreach(glib2libdir ${GLIB2_LIBRARIES})
message(STATUS " " ${glib2libdir})
endforeach()

restore_pkg_config_env()
29 changes: 0 additions & 29 deletions cmake/Modules/PkgConfigTools.cmake

This file was deleted.

0 comments on commit 27496f3

Please sign in to comment.