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
91ee265d
Commit
91ee265d
authored
14 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
fix lua+atlas search on ubuntu
parent
9bdd6dec
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+12
-3
12 additions, 3 deletions
CMakeLists.txt
with
12 additions
and
3 deletions
CMakeLists.txt
+
12
−
3
View file @
91ee265d
...
...
@@ -205,8 +205,7 @@ if(ENABLE_BLAS_LAPACK)
endif
(
LAPACK_LIBRARIES
)
endif
(
LAPACK_LIBRARIES
)
elseif
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Linux"
)
# on Linux also try to find the Intel MKL without a Fortran
# compiler
# on Linux try to find the Intel MKL without a Fortran compiler
if
(
HAVE_64BIT_SIZE_T
)
set
(
MKL_PATH lib/em64t
)
else
(
HAVE_64BIT_SIZE_T
)
...
...
@@ -217,6 +216,16 @@ if(ENABLE_BLAS_LAPACK)
if
(
LAPACK_LIBRARIES
)
set_config_option
(
HAVE_BLAS
"Blas(IntelMKL)"
)
set_config_option
(
HAVE_LAPACK
"Lapack(IntelMKL)"
)
else
(
LAPACK_LIBRARIES
)
# on Linux also try to find ATLAS without a Fortran compiler,
# because cmake ships with a buggy FindBLAS e.g. on Ubuntu Lucid
# Lynx
set
(
ATLAS_LIBS_REQUIRED lapack f77blas atlas
)
find_all_libraries
(
LAPACK_LIBRARIES ATLAS_LIBS_REQUIRED
""
""
)
if
(
LAPACK_LIBRARIES
)
set_config_option
(
HAVE_BLAS
"Blas(ATLAS)"
)
set_config_option
(
HAVE_LAPACK
"Lapack(ATLAS)"
)
endif
(
LAPACK_LIBRARIES
)
endif
(
LAPACK_LIBRARIES
)
elseif
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"SunOS"
)
# on SunOS we know blas and lapack are available in sunperf
...
...
@@ -565,7 +574,7 @@ endif(ENABLE_TAUCS)
if
(
ENABLE_LUA
)
find_library
(
LUA_LIB lua PATH_SUFFIXES lib
)
if
(
LUA_LIB
)
find_path
(
LUA_INC
"lua.h"
PATH_SUFFIXES src include
)
find_path
(
LUA_INC
"lua.h"
PATH_SUFFIXES
lua5.1
src include
)
if
(
LUA_INC
)
set_config_option
(
HAVE_LUA
"Lua"
)
list
(
APPEND EXTERNAL_LIBRARIES
${
LUA_LIB
}
)
...
...
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