Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-alugrid
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
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
Code review analytics
Issue analytics
Insights
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
ag-ohlberger
dune-community
dune-alugrid
Commits
7f4f7fc2
Commit
7f4f7fc2
authored
8 years ago
by
Elias Pipping
Browse files
Options
Downloads
Patches
Plain Diff
Make compile with zlib in a nonstandard location
parent
0ee2c3af
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/modules/DuneAlugridMacros.cmake
+1
-1
1 addition, 1 deletion
cmake/modules/DuneAlugridMacros.cmake
lib/CMakeLists.txt
+2
-0
2 additions, 0 deletions
lib/CMakeLists.txt
with
3 additions
and
1 deletion
cmake/modules/DuneAlugridMacros.cmake
+
1
−
1
View file @
7f4f7fc2
...
...
@@ -43,7 +43,7 @@ if(ZLIB_FOUND)
# register package flags is not supported in CMake with Dune 2.3
if
(
NOT
((
"
${
DUNE_COMMON_VERSION_MAJOR
}
"
STREQUAL
"2"
)
AND
(
"
${
DUNE_COMMON_VERSION_MINOR
}
"
STREQUAL
"3"
)))
dune_register_package_flags
(
INCLUDE_DIRS
${
ZLIB_INCLUDE_DIR
S
}
LIBRARIES
${
ZLIB_LIBRARIES
}
)
dune_register_package_flags
(
INCLUDE_DIRS
${
ZLIB_INCLUDE_DIR
}
LIBRARIES
${
ZLIB_LIBRARIES
}
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
lib/CMakeLists.txt
+
2
−
0
View file @
7f4f7fc2
...
...
@@ -24,6 +24,8 @@ target_link_libraries(dunealugrid ${ZOLTAN_LIBRARIES})
set_property
(
TARGET dunealugrid APPEND PROPERTY
INCLUDE_DIRECTORIES
"
${
ZOLTAN_INCLUDE_DIRS
}
"
)
endif
()
set_property
(
TARGET dunealugrid APPEND PROPERTY
INCLUDE_DIRECTORIES
"
${
ZLIB_INCLUDE_DIR
}
"
)
# register alu grid to all pkg flags
dune_register_package_flags
(
LIBRARIES
"
${
DUNE_ALUGRID_LIBRARY
}
"
...
...
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