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
044574e7
Commit
044574e7
authored
12 years ago
by
Markus Blatt
Browse files
Options
Downloads
Patches
Plain Diff
Enable testing _BEFORE_ adding sub directories.
[[Imported from SVN: r6609]]
parent
babe7bc5
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
+8
-3
8 additions, 3 deletions
CMakeLists.txt
with
8 additions
and
3 deletions
CMakeLists.txt
+
8
−
3
View file @
044574e7
...
...
@@ -77,6 +77,11 @@ configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
include_directories
(
"
${
CMAKE_CURRENT_BINARY_DIR
}
"
)
add_definitions
(
-DHAVE_CONFIG_H
)
# enable testing before adding the subdirectories.
# Thus we can add the tests in the subdirectories
# where they actually are.
enable_testing
()
# add subdirectories to execute CMakeLists.txt there
add_subdirectory
(
"dune"
)
add_subdirectory
(
"bin"
)
...
...
@@ -84,7 +89,7 @@ add_subdirectory("m4")
add_subdirectory
(
"am"
)
add_subdirectory
(
"doc"
)
# set some variables that are used in the pkg-config file
set
(
CMAKE_FIND_LIBRARY_SUFFIXES
${
_dune_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES
}
)
set
(
prefix
${
CMAKE_INSTALL_PREFIX
}
)
set
(
exec_prefix
"
\$
{prefix}"
)
...
...
@@ -95,6 +100,7 @@ set(VERSION ${DUNE_MOD_VERSION})
set
(
CC
${
CMAKE_C_COMPILER
}
)
set
(
CXX
${
CMAKE_CXX_COMPILER
}
)
#create pkg-config file
configure_file
(
${
PROJECT_SOURCE_DIR
}
/
${
DUNE_MOD_NAME
}
.pc.in
${
PROJECT_BINARY_DIR
}
/
${
DUNE_MOD_NAME
}
.pc
...
...
@@ -108,8 +114,7 @@ if(PKG_CONFIG_FOUND )
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
DUNE_MOD_NAME
}
.pc
DESTINATION lib/pkgconfig
)
endif
(
PKG_CONFIG_FOUND
)
# set up CTest
enable_testing
()
include
(
CTest
)
# add tests from dune/common/test
add_test
(
arraylisttest dune/common/test/arraylisttest
)
...
...
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