Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gmsh
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
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
4f6f471f
Commit
4f6f471f
authored
14 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
workaround missing xft/xinerama cmake detection on unix
parent
9e1eeb69
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+17
-0
17 additions, 0 deletions
CMakeLists.txt
with
17 additions
and
0 deletions
CMakeLists.txt
+
17
−
0
View file @
4f6f471f
...
@@ -334,6 +334,23 @@ if(ENABLE_FLTK)
...
@@ -334,6 +334,23 @@ if(ENABLE_FLTK)
# required for system sounds (until cmake updates find_package(FLTK))
# required for system sounds (until cmake updates find_package(FLTK))
list
(
APPEND FLTK_LIBRARIES
"-framework AudioToolbox"
)
list
(
APPEND FLTK_LIBRARIES
"-framework AudioToolbox"
)
endif
(
APPLE AND FLTK_VERSION EQUAL 1.3
)
endif
(
APPLE AND FLTK_VERSION EQUAL 1.3
)
if
(
UNIX AND FLTK_CONFIG_SCRIPT
)
# missing Xft/Xinerama (until cmake updates find_package(FLTK))
execute_process
(
COMMAND
${
FLTK_CONFIG_SCRIPT
}
--ldflags
OUTPUT_VARIABLE FLTK_LDFLAGS
)
if
(
X11_Xft_FOUND
)
string
(
REGEX MATCH
".*Xft.*"
${
FLTK_LDFLAGS
}
FLTK_HAVE_XFT
)
if
(
FLTK_HAVE_XFT
)
list
(
APPEND FLTK_LIBRARIES
${
X11_Xft_LIB
}
)
endif
(
FLTK_HAVE_XFT
)
endif
(
X11_Xft_FOUND
)
if
(
X11_Xinerama_FOUND
)
string
(
REGEX MATCH
".*Xinerama.*"
${
FLTK_LDFLAGS
}
FLTK_HAVE_XINERAMA
)
if
(
FLTK_HAVE_XINERAMA
)
list
(
APPEND FLTK_LIBRARIES
${
X11_Xinerama_LIB
}
)
endif
(
FLTK_HAVE_XINERAMA
)
endif
(
X11_Xinerama_FOUND
)
endif
(
UNIX AND FLTK_CONFIG_SCRIPT
)
endif
(
FLTK_FOUND
)
endif
(
FLTK_FOUND
)
elseif
(
ENABLE_QT
)
elseif
(
ENABLE_QT
)
find_package
(
Qt4
)
find_package
(
Qt4
)
...
...
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