Skip to content

Commit

Permalink
Merge pull request #1235 from phcerdan/lut-zlib
Browse files Browse the repository at this point in the history
Fix DESTDIR behavior at install time.
  • Loading branch information
dcoeurjo authored Jan 24, 2017
2 parents fcec17f + b59f6c0 commit dc8b334
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
(David Coeurjolly, [#1208](https://github.com/DGtal-team/DGtal/pull/1208))
- Continuous integration Travis bots are now based on ubunutu/trusty containers.
(David Coeurjolly, [#1227](https://github.com/DGtal-team/DGtal/pull/1208))
- Fix usage of DESTDIR at install time for linux packagers.
(Pablo Hernandez, [#1235](https://github.com/DGtal-team/DGtal/pull/1235))

- *Geometry Package*
- ArithDSSIterator: fix missing postfix ++.
Expand Down
6 changes: 4 additions & 2 deletions cmake/NeighborhoodTablesConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ configure_file(

# ------ Install Tree ------ #
#--- Configuration of the src/topology/tables/NeighborhoodTables.h.in for the install tree. Save to tmp file.
# dev note: The variables are expanded before they are passed to install(CODE). We have to scape TABLE_DIR inside configure_file if we want it to be updated with the value set inside the install script.
# dev note: we escape \$ENV{DESTDIR} because we want DESTDIR to be read at
# install time, not at configure time. The same with TABLE_DIR inside configure_file.
# Read more: https://cmake.org/pipermail/cmake-developers/2013-January/017810.html
install(CODE "
set(TABLE_DIR $ENV{DESTDIR}${INSTALL_INCLUDE_DIR}/DGtal/topology/tables)
set(TABLE_DIR \$ENV{DESTDIR}${INSTALL_INCLUDE_DIR}/DGtal/topology/tables)
configure_file(
${PROJECT_SOURCE_DIR}/src/DGtal/topology/tables/NeighborhoodTables.h.in
\${TABLE_DIR}/NeighborhoodTables.h @ONLY)")
Expand Down

0 comments on commit dc8b334

Please sign in to comment.