Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fltk
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Will2.Mcgregor@live.uwe.ac.uk
fltk
Commits
6fe226cb
Commit
6fe226cb
authored
5 years ago
by
ManoloFLTK
Browse files
Options
Downloads
Patches
Plain Diff
CMake: use pkg_check_modules to search for pangoxft
Command pkg_check_modules is present in CMake 2.6
parent
7ca708a4
No related branches found
No related tags found
Loading
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMake/options.cmake
+10
-0
10 additions, 0 deletions
CMake/options.cmake
with
10 additions
and
0 deletions
CMake/options.cmake
+
10
−
0
View file @
6fe226cb
...
@@ -462,6 +462,15 @@ endif (OPTION_USE_PANGO)
...
@@ -462,6 +462,15 @@ endif (OPTION_USE_PANGO)
#######################################################################
#######################################################################
if
(
X11_Xft_FOUND AND OPTION_USE_PANGO
)
if
(
X11_Xft_FOUND AND OPTION_USE_PANGO
)
pkg_check_modules
(
PANGOXFT pangoxft
)
# message(STATUS "PANGOXFT_FOUND=" ${PANGOXFT_FOUND})
if
(
PANGOXFT_FOUND
)
include_directories
(
${
PANGOXFT_INCLUDE_DIRS
}
)
find_library
(
HAVE_LIB_PANGO pango-1.0
${
CMAKE_LIBRARY_PATH
}
)
find_library
(
HAVE_LIB_PANGOXFT pangoxft-1.0
${
CMAKE_LIBRARY_PATH
}
)
set
(
USE_PANGO TRUE
)
else
(
PANGOXFT_FOUND
)
#this covers Debian, Ubuntu, FreeBSD, NetBSD, Darwin
#this covers Debian, Ubuntu, FreeBSD, NetBSD, Darwin
if
(
APPLE AND OPTION_APPLE_X11
)
if
(
APPLE AND OPTION_APPLE_X11
)
find_file
(
FINK_PREFIX NAMES /opt/sw /sw
)
find_file
(
FINK_PREFIX NAMES /opt/sw /sw
)
...
@@ -500,6 +509,7 @@ if(X11_Xft_FOUND AND OPTION_USE_PANGO)
...
@@ -500,6 +509,7 @@ if(X11_Xft_FOUND AND OPTION_USE_PANGO)
set
(
LDFLAGS
"
${
LDFLAGS
}
-L
${
FINK_PREFIX
}
/lib"
)
set
(
LDFLAGS
"
${
LDFLAGS
}
-L
${
FINK_PREFIX
}
/lib"
)
endif
(
APPLE
)
endif
(
APPLE
)
endif
(
HAVE_LIB_PANGO AND HAVE_LIB_PANGOXFT AND HAVE_LIB_GOBJECT
)
endif
(
HAVE_LIB_PANGO AND HAVE_LIB_PANGOXFT AND HAVE_LIB_GOBJECT
)
endif
(
PANGOXFT_FOUND
)
endif
(
X11_Xft_FOUND AND OPTION_USE_PANGO
)
endif
(
X11_Xft_FOUND AND OPTION_USE_PANGO
)
if
(
OPTION_USE_XFT
)
if
(
OPTION_USE_XFT
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment