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
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
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
Timo Koch
dune-common
Commits
a9457ed7
Commit
a9457ed7
authored
12 years ago
by
Christoph Grüninger
Browse files
Options
Downloads
Patches
Plain Diff
[CMake] White-space adjustments.
[[Imported from SVN: r6748]]
parent
030b4cf7
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/modules/DuneMacros.cmake
+8
-10
8 additions, 10 deletions
cmake/modules/DuneMacros.cmake
dune/common/CMakeLists.txt
+64
-64
64 additions, 64 deletions
dune/common/CMakeLists.txt
with
72 additions
and
74 deletions
cmake/modules/DuneMacros.cmake
+
8
−
10
View file @
a9457ed7
...
...
@@ -151,7 +151,7 @@ macro(dune_project)
else
(
APPLE
)
set
(
CMAKE_FIND_LIBRARY_SUFFIXES .a
)
endif
(
APPLE
)
endif
()
endif
(
DUNE_USE_ONLY_STATIC_LIBS
)
# set required compiler flags for C++11 (former C++0x)
find_package
(
CXX11Features
)
...
...
@@ -220,7 +220,7 @@ macro(dune_project)
message
(
STATUS
"Setting
${
_mod
}
_LIBRARIES=
${${
_mod
}
_LIBRARIES
}
"
)
if
(
${
_mod
}
_LIBRARIES
)
foreach
(
_lib
${${
_mod
}
_LIBRARIES
}
)
list
(
APPEND DUNE_DEFAULT_LIBS
"
${
_lib
}
"
)
list
(
APPEND DUNE_DEFAULT_LIBS
"
${
_lib
}
"
)
endforeach
(
_lib
${${
_mod
}
_LIBRARIES
}
)
endif
(
${
_mod
}
_LIBRARIES
)
endforeach
(
_mod DEPENDENCY_TREE
)
...
...
@@ -264,8 +264,8 @@ macro(dune_regenerate_config_cmake)
if
(
EXISTS
${
_mod_conf_file
}
)
file
(
READ
"
${
_mod_conf_file
}
"
_file
)
string
(
REGEX REPLACE
".*/
\\
*[ ]*begin[ ]+
${
_dep
}
[^
\\
*]*
\\
*/(.*)/[/
\\
*][ ]*end[ ]*
${
_dep
}
[^
\\
*]*
\\
*/"
"
\\
1"
_tfile
"
${
_file
}
"
)
".*/
\\
*[ ]*begin[ ]+
${
_dep
}
[^
\\
*]*
\\
*/(.*)/[/
\\
*][ ]*end[ ]*
${
_dep
}
[^
\\
*]*
\\
*/"
"
\\
1"
_tfile
"
${
_file
}
"
)
# strip the private section
string
(
REGEX REPLACE
"(.*)/[
\\
*][ ]*begin private.*/[
\\
*][ ]*end[ ]*private[^
\\
*]
\\
*/(.*)"
"
\\
1
\\
2"
_file
"
${
_tfile
}
"
)
file
(
APPEND
${
CONFIG_H_CMAKE_FILE
}
"
${
_file
}
"
)
...
...
@@ -278,7 +278,6 @@ endmacro(dune_regenerate_config_cmake)
# Namely it creates config.h and the cmake-config files,
# some install directives and exports the module.
macro
(
finalize_dune_project
)
#create cmake-config files for build tree
configure_file
(
${
PROJECT_SOURCE_DIR
}
/
${
DUNE_MOD_NAME
}
-config.cmake.in
...
...
@@ -368,22 +367,21 @@ macro(dune_add_library basename)
set
(
_created_libs
${
basename
}
)
if
(
DUNE_BUILD_BOTH_LIBS
)
if
(
BUILD_SHARED_LIBS
)
#create static lib
add_library
(
${
basename
}
-static STATIC
${
ARGN
}
)
# make sure both libs have the same name.
set_target_properties
(
${
basename
}
-static PROPERTIES
OUTPUT_NAME
${
basename
}
ARCHIVE_OUTPUT_DIRECTORY
"
${
PROJECT_BINARY_DIR
}
/lib"
)
OUTPUT_NAME
${
basename
}
ARCHIVE_OUTPUT_DIRECTORY
"
${
PROJECT_BINARY_DIR
}
/lib"
)
list
(
APPEND _created_libs
${
basename
}
-static
)
else
(
BUILD_SHARED_LIBS
)
#create shared libs
add_library
(
${
basename
}
-shared SHARED
${
ARGN
}
)
set_target_properties
(
${
basename
}
-shared PROPERTIES
OUTPUT_NAME
${
basename
}
LIBRARY_OUTPUT_DIRECTORY
"
${
PROJECT_BINARY_DIR
}
/lib"
)
OUTPUT_NAME
${
basename
}
LIBRARY_OUTPUT_DIRECTORY
"
${
PROJECT_BINARY_DIR
}
/lib"
)
list
(
APPEND _created_libs
${
basename
}
-shared
)
endif
(
BUILD_SHARED_LIBS
)
endif
(
DUNE_BUILD_BOTH_LIBS
)
...
...
This diff is collapsed.
Click to expand it.
dune/common/CMakeLists.txt
+
64
−
64
View file @
a9457ed7
...
...
@@ -17,70 +17,70 @@ endif(${LAPACK_LIBRARIES})
#install headers
install
(
FILES
alignment.hh
array.hh
arraylist.hh
bartonnackmanifcheck.hh
bigunsignedint.hh
binaryfunctions.hh
bitsetvector.hh
classname.hh
collectivecommunication.hh
debugstream.hh
deprecated.hh
densematrix.hh
densevector.hh
documentation.hh
dynmatrix.hh
dynvector.hh
enumset.hh
exceptions.hh
fassign.hh
finitestack.hh
float_cmp.cc
float_cmp.hh
fmatrix.hh
fmatrixev.hh
forloop.hh
ftraits.hh
function.hh
fvector.hh
gcd.hh
genericiterator.hh
geometrytype.hh
geometrytypeindex.hh
gmpfield.hh
indent.hh
interfaces.hh
ios_state.hh
iteratorfacades.hh
lcm.hh
lru.hh
math.hh
matvectraits.hh
misc.hh
mpicollectivecommunication.hh
mpiguard.hh
mpihelper.hh
mpitraits.hh
nullptr.hh
parametertree.hh
parametertreeparser.hh
path.hh
poolallocator.hh
precision.hh
propertymap.hh
reservedvector.hh
shared_ptr.hh
singleton.hh
sllist.hh
static_assert.hh
stdstreams.hh
timer.hh
tuples.hh
tupleutility.hh
typetraits.hh
unused.hh
version.hh
array.hh
arraylist.hh
bartonnackmanifcheck.hh
bigunsignedint.hh
binaryfunctions.hh
bitsetvector.hh
classname.hh
collectivecommunication.hh
debugstream.hh
deprecated.hh
densematrix.hh
densevector.hh
documentation.hh
dynmatrix.hh
dynvector.hh
enumset.hh
exceptions.hh
fassign.hh
finitestack.hh
float_cmp.cc
float_cmp.hh
fmatrix.hh
fmatrixev.hh
forloop.hh
ftraits.hh
function.hh
fvector.hh
gcd.hh
genericiterator.hh
geometrytype.hh
geometrytypeindex.hh
gmpfield.hh
indent.hh
interfaces.hh
ios_state.hh
iteratorfacades.hh
lcm.hh
lru.hh
math.hh
matvectraits.hh
misc.hh
mpicollectivecommunication.hh
mpiguard.hh
mpihelper.hh
mpitraits.hh
nullptr.hh
parametertree.hh
parametertreeparser.hh
path.hh
poolallocator.hh
precision.hh
propertymap.hh
reservedvector.hh
shared_ptr.hh
singleton.hh
sllist.hh
static_assert.hh
stdstreams.hh
timer.hh
tuples.hh
tupleutility.hh
typetraits.hh
unused.hh
version.hh
DESTINATION include/dune/common
)
# Install some test headers, because they get used by tests in other modules
...
...
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