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
0aa6b7b4
Commit
0aa6b7b4
authored
5 months ago
by
Santiago Ospina De Los Ríos
Browse files
Options
Downloads
Patches
Plain Diff
Revert CMake conditional export of ${ProjectName}_INCLUDE_DIRS variable
parent
94993239
No related branches found
No related tags found
2 merge requests
!1470
Fix wrong variable name to make target hash (2.10)
,
!1355
Provide a cmake utility dune_default_include_directories
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cmake/modules/DuneProject.cmake
+1
-2
1 addition, 2 deletions
cmake/modules/DuneProject.cmake
with
1 addition
and
2 deletions
cmake/modules/DuneProject.cmake
+
1
−
2
View file @
0aa6b7b4
...
...
@@ -172,7 +172,6 @@ macro(dune_project)
include_directories
(
"
${
PROJECT_BINARY_DIR
}
"
)
include_directories
(
"
${
PROJECT_BINARY_DIR
}
/include"
)
include_directories
(
"
${
PROJECT_BINARY_DIR
}
/include_private"
)
set
(
CONFIG_INCLUDE_DIRS
"set_and_check(
${
ProjectName
}
_INCLUDE_DIRS
\"
@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@
\"
)"
)
endif
()
unset
(
_include_policy
)
add_definitions
(
-DHAVE_CONFIG_H
)
...
...
@@ -294,7 +293,7 @@ set(${ProjectName}_INSTALLED @MODULE_INSTALLED@)
#report other information
set_and_check(
${
ProjectName
}
_PREFIX
\"\$
{PACKAGE_PREFIX_DIR}
\"
)
${
CONFIG
_INCLUDE
_
DIR
S
}
set_and_check(
${
ProjectName
}
_INCLUDE_DIRS
\"
@PACKAGE_CMAKE_INSTALL
_INCLUDEDIR
@
\"
)
set(
${
ProjectName
}
_CMAKE_CONFIG_VERSION
\"
${
DUNE_COMMON_VERSION
}
\"
)
set(
${
ProjectName
}
_CXX_FLAGS
\"
${
CMAKE_CXX_FLAGS
}
\"
)
set(
${
ProjectName
}
_CXX_FLAGS_DEBUG
\"
${
CMAKE_CXX_FLAGS_DEBUG
}
\"
)
...
...
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