Skip to content
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

Jump to bottom

glib fix for Windows #154

Merged
merged 4 commits into from
Mar 12, 2021
Merged

glib fix for Windows #154

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f4575b
GTS fix for Windows
chapulina Feb 14, 2021
ea461dd
Merge branch 'ign-cmake2' into chapulina/2/glib
chapulina Mar 10, 2021
4c9a899
Check if paths are valid before appending
chapulina Mar 11, 2021
2d90059
Reorder and print message
chapulina Mar 12, 2021
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
21 changes: 21 additions & 0 deletions cmake/FindGTS.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,27 @@ else()

# 2.1 Need glib library
find_library(GLIB_LIBRARY glib-2.0)
if (NOT GLIB_LIBRARY)
if(NOT GTS_FIND_QUIETLY)
message(STATUS "Looking for glib library - not found")
endif()
else()
if(NOT GTS_FIND_QUIETLY)
message(STATUS "Looking for glib library - found")
endif()
endif()
find_path(GLIB_INCLUDE_DIR
NAMES glib.h
PATH_SUFFIXES glib-2.0)
if (GLIB_INCLUDE_DIR)
list(APPEND GTS_INCLUDE_DIRS "${GLIB_INCLUDE_DIR}")
endif()
find_path(GLIBCONFIG_INCLUDE_DIR
NAMES glibconfig.h
PATH_SUFFIXES lib/glib-2.0/include)
if (GLIBCONFIG_INCLUDE_DIR)
list(APPEND GTS_INCLUDE_DIRS "${GLIBCONFIG_INCLUDE_DIR}")
endif()
list(APPEND GTS_LIBRARIES "${GLIB_LIBRARY}")

if (GTS_FOUND)
Expand Down