Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-common
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Core Modules
dune-common
Commits
36f84c4b
Commit
36f84c4b
authored
12 years ago
by
Christoph Grüninger
Browse files
Options
Downloads
Patches
Plain Diff
Use LAPACK for eigenvaluestest only iff LAPACK was found.
[[Imported from SVN: r7073]]
parent
73064935
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cmake/modules/DunePkgConfig.cmake
+1
-1
1 addition, 1 deletion
cmake/modules/DunePkgConfig.cmake
cmake/modules/FindCXX11Features.cmake
+5
-3
5 additions, 3 deletions
cmake/modules/FindCXX11Features.cmake
dune/common/test/CMakeLists.txt
+4
-1
4 additions, 1 deletion
dune/common/test/CMakeLists.txt
with
10 additions
and
5 deletions
cmake/modules/DunePkgConfig.cmake
+
1
−
1
View file @
36f84c4b
...
...
@@ -13,7 +13,7 @@ set(includedir "\${prefix}/include")
set
(
PACKAGE_NAME
${
DUNE_MOD_NAME
}
)
set
(
VERSION
${
DUNE_MOD_VERSION
}
)
set
(
CC
${
CMAKE_C_COMPILER
}
)
set
(
CXX
"
${
CMAKE_CXX_COMPILER
}
${
CXX_STD
0X
_FLAGS
}
"
)
set
(
CXX
"
${
CMAKE_CXX_COMPILER
}
${
CXX_STD
11
_FLAGS
}
"
)
set
(
REQUIRES
${
DUNE_DEPENDS
}
)
#create pkg-config file
...
...
This diff is collapsed.
Click to expand it.
cmake/modules/FindCXX11Features.cmake
+
5
−
3
View file @
36f84c4b
...
...
@@ -16,6 +16,7 @@
# HAVE_RVALUE_REFERENCES True if rvalue references are supported
include
(
CMakePushCheckState
)
cmake_push_check_state
()
# test for C++11 flags
include
(
TestCXXAcceptsFlag
)
...
...
@@ -29,7 +30,7 @@ if(CXX_FLAG_CXX11)
set
(
CMAKE_CXX_FLAGS_MINSIZEREL
"
${
CMAKE_CXX_FLAGS_MINSIZEREL
}
-std=c++11 "
)
set
(
CMAKE_CXX_FLAGS_RELEASE
"
${
CMAKE_CXX_FLAGS_RELEASE
}
-std=c++11 "
)
set
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"
${
CMAKE_CXX_FLAGS_RELWITHDEBINFO
}
-std=c++11 "
)
set
(
CXX_STD
0X
_FLAGS
"-std=c++11"
)
set
(
CXX_STD
11
_FLAGS
"-std=c++11"
)
else
()
# try to use compiler flag -std=c++0x for older compilers
CHECK_CXX_ACCEPTS_FLAG
(
"-std=c++0x"
CXX_FLAG_CXX0X
)
...
...
@@ -40,7 +41,7 @@ else()
set
(
CMAKE_CXX_FLAGS_MINSIZEREL
"
${
CMAKE_CXX_FLAGS_MINSIZEREL
}
-std=c++0x "
)
set
(
CMAKE_CXX_FLAGS_RELEASE
"
${
CMAKE_CXX_FLAGS_RELEASE
}
-std=c++0x "
)
set
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"
${
CMAKE_CXX_FLAGS_RELWITHDEBINFO
}
-std=c++0x "
)
set
(
CXX_STD
0X
_FLAGS
"-std=c++0x"
)
set
(
CXX_STD
11
_FLAGS
"-std=c++0x"
)
endif
(
CXX_FLAG_CXX0X
)
endif
(
CXX_FLAG_CXX11
)
...
...
@@ -284,10 +285,11 @@ else()
endif
(
NOT HAVE_FUNCTIONAL
)
if
(
_functional_header
)
message
(
STATUS
${
CMAKE_REQUIRED_DEFINTIONS
}
)
check_cxx_source_compiles
(
"
#include <
${
_functional_header
}
>
int main(void){
${
_hash_type
}
<int> hasher; hasher(42);
}"
${
_hash_variable
}
)
endif
(
_functional_header
)
cmake_pop_check_state
()
This diff is collapsed.
Click to expand it.
dune/common/test/CMakeLists.txt
+
4
−
1
View file @
36f84c4b
...
...
@@ -95,7 +95,10 @@ target_link_libraries("dynmatrixtest" "dunecommon")
add_executable
(
"dynvectortest"
dynvectortest.cc
)
add_executable
(
"eigenvaluestest"
eigenvaluestest.cc
)
target_link_libraries
(
eigenvaluestest dunecommon
${
LAPACK_LIBRARIES
}
)
target_link_libraries
(
eigenvaluestest dunecommon
)
if
(
LAPACK_FOUND
)
target_link_libraries
(
eigenvaluestest
${
LAPACK_LIBRARIES
}
)
endif
(
LAPACK_FOUND
)
add_executable
(
"diagonalmatrixtest"
diagonalmatrixtest.cc
)
...
...
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