From 754bf58fbf2d39571b0f972c93601e2dfdac4ed3 Mon Sep 17 00:00:00 2001 From: Kerautret Date: Sat, 11 Apr 2020 00:31:22 +0200 Subject: [PATCH 1/4] fix warning ld boost prog options --- CMakeLists.txt | 2 ++ ChangeLog.md | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1bb3ffd8..f7d6b3f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,6 +70,8 @@ if ( Boost_FOUND ) ${Boost_LIBRAIRIES} ${Boost_PROGRAM_OPTIONS_LIBRARY} Boost::program_options) SET(DGtalLibInc ${Boost_INCLUDE_DIRS}) + ## Used to avoid ld warnings + set (CMAKE_CXX_FLAGS "-fvisibility=hidden") endif( Boost_FOUND ) diff --git a/ChangeLog.md b/ChangeLog.md index 8cba3b99..2f36008c 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -5,13 +5,16 @@ [#356](https://github.com/DGtal-team/DGtalTools/pull/356)) - set cmake based CPP11 check instead the manual DGtal check. (Bertrand Kerautret [#364](https://github.com/DGtal-team/DGtalTools/pull/364)) - + - fix ld boost program options macos warnings. + Kerautret [#XXX](https://github.com/DGtal-team/DGtalTools/pull/XXX)) + - *volumetric: - Passing argument by const reference in (min|max|mean)Val of volSubSample. (Roland Denis, [#359](https://github.com/DGtal-team/DGtalTools/pull/359/files)) - Using SourceForge to download doxygen sources during Travis CI jobs. (Roland Denis [#360](https://github.com/DGtal-team/DGtalTools/pull/360)) + # DGtalTools 1.0 - *generators* From 60c531f4efe787a1c1b09cd82465df1f8769e6a6 Mon Sep 17 00:00:00 2001 From: Kerautret Date: Sat, 11 Apr 2020 00:35:30 +0200 Subject: [PATCH 2/4] changelog --- ChangeLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 2f36008c..f756e3bd 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -6,7 +6,7 @@ - set cmake based CPP11 check instead the manual DGtal check. (Bertrand Kerautret [#364](https://github.com/DGtal-team/DGtalTools/pull/364)) - fix ld boost program options macos warnings. - Kerautret [#XXX](https://github.com/DGtal-team/DGtalTools/pull/XXX)) + Kerautret [#366](https://github.com/DGtal-team/DGtalTools/pull/366)) - *volumetric: - Passing argument by const reference in (min|max|mean)Val of volSubSample. From 4b0b2d7c62f823a979327d2190f84eb3bb35dea5 Mon Sep 17 00:00:00 2001 From: Kerautret Date: Sat, 11 Apr 2020 01:04:27 +0200 Subject: [PATCH 3/4] only on apple --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f7d6b3f3..91b7d9f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,9 @@ if ( Boost_FOUND ) ${Boost_PROGRAM_OPTIONS_LIBRARY} Boost::program_options) SET(DGtalLibInc ${Boost_INCLUDE_DIRS}) ## Used to avoid ld warnings - set (CMAKE_CXX_FLAGS "-fvisibility=hidden") + if(APPLE) + set (CMAKE_CXX_FLAGS "-fvisibility=hidden") + endif(APPLE) endif( Boost_FOUND ) From ddafaec42ed30fb06c6365d3190f70f938e97641 Mon Sep 17 00:00:00 2001 From: Bertrand Kerautret Date: Sat, 2 May 2020 11:21:29 +0200 Subject: [PATCH 4/4] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 91b7d9f8..7245e25c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,7 @@ if ( Boost_FOUND ) ${Boost_LIBRAIRIES} ${Boost_PROGRAM_OPTIONS_LIBRARY} Boost::program_options) SET(DGtalLibInc ${Boost_INCLUDE_DIRS}) - ## Used to avoid ld warnings + ## Used to avoid ld warnings (to be removed when using CLI11 instead program_options) if(APPLE) set (CMAKE_CXX_FLAGS "-fvisibility=hidden") endif(APPLE)