updated build system

CMakeLists.txt

@@ -122,6 +122,7 @@ endif()
       -DPROJECT_COPYRIGHT=${PROJECT_COPYRIGHT}
       -DPROJECT_DESC=${PROJECT_DESC}
       -DPROJECT_DIST_DIR=${PROJECT_DIST_DIR}
+      -DPROJECT_ENABLE_BACKWARD_CPP=${PROJECT_ENABLE_BACKWARD_CPP}
       -DPROJECT_ENABLE_BOOST=${PROJECT_ENABLE_BOOST}
       -DPROJECT_ENABLE_CPP_HTTPLIB=${PROJECT_ENABLE_CPP_HTTPLIB}
       -DPROJECT_ENABLE_CURL=${PROJECT_ENABLE_CURL}

cmake/libraries.cmake

@@ -6,6 +6,7 @@ include(cmake/libraries/openssl.cmake)
 
 include(cmake/libraries/boost.cmake)
 
+include(cmake/libraries/backward_cpp.cmake)
 include(cmake/libraries/cpp_httplib.cmake)
 include(cmake/libraries/curl.cmake)
 include(cmake/libraries/fuse.cmake)

cmake/options.cmake

@@ -1,3 +1,4 @@
+option(PROJECT_ENABLE_BACKWARD_CPP "Enable backward-cpp" ON)
 option(PROJECT_ENABLE_BOOST "Enable boost libraries" ON)
 option(PROJECT_ENABLE_CPP_HTTPLIB "Enable cpp-httplib" ON)
 option(PROJECT_ENABLE_CURL "Enable curl library" ON)

config.sh

@@ -19,6 +19,7 @@ PROJECT_APP_LIST=(${PROJECT_NAME})
 PROJECT_PRIVATE_KEY=${DEVELOPER_PRIVATE_KEY}
 PROJECT_PUBLIC_KEY=${DEVELOPER_PUBLIC_KEY}
 
+PROJECT_ENABLE_BACKWARD_CPP=ON
 PROJECT_ENABLE_BOOST=ON
 PROJECT_ENABLE_CPP_HTTPLIB=ON
 PROJECT_ENABLE_CURL=ON
@@ -33,6 +34,7 @@ PROJECT_ENABLE_STDUUID=ON
 PROJECT_ENABLE_TESTING=ON
 PROJECT_ENABLE_WINFSP=ON
 
+PROJECT_KEEP_BACKWARD_CPP=1
 PROJECT_STATIC_LINK=ON
 
 PROJECT_MINGW64_COPY_DEPENDENCIES+=()

deps/src/backward.cpp

@@ -1,42 +0,0 @@
-// Pick your poison.
-//
-// On GNU/Linux, you have few choices to get the most out of your stack trace.
-//
-// By default you get:
-//	- object filename
-//	- function name
-//
-// In order to add:
-//	- source filename
-//	- line and column numbers
-//	- source code snippet (assuming the file is accessible)
-
-// Install one of the following libraries then uncomment one of the macro (or
-// better, add the detection of the lib and the macro definition in your build
-// system)
-
-// - apt-get install libdw-dev ...
-// - g++/clang++ -ldw ...
-// #define BACKWARD_HAS_DW 1
-
-// - apt-get install binutils-dev ...
-// - g++/clang++ -lbfd ...
-// #define BACKWARD_HAS_BFD 1
-
-// - apt-get install libdwarf-dev ...
-// - g++/clang++ -ldwarf ...
-// #define BACKWARD_HAS_DWARF 1
-
-// Regardless of the library you choose to read the debug information,
-// for potentially more detailed stack traces you can use libunwind
-// - apt-get install libunwind-dev
-// - g++/clang++ -lunwind
-// #define BACKWARD_HAS_LIBUNWIND 1
-
-#include "backward.hpp"
-
-namespace backward {
-
-backward::SignalHandling sh;
-
-} // namespace backward

repertory/repertory/main.cpp

@@ -19,7 +19,7 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   SOFTWARE.
 */
-#if !defined(PROJECT_STATIC_LINK)
+#if defined(PROJECT_ENABLE_BACKWARD_CPP)
 #include "backward.hpp"
 #endif
 
@@ -32,7 +32,7 @@
 using namespace repertory;
 
 auto main(int argc, char **argv) -> int {
-#if !defined(PROJECT_STATIC_LINK)
+#if defined(PROJECT_ENABLE_BACKWARD_CPP)
   static backward::SignalHandling sh;
 #endif
 

repertory/repertory_test/main.cpp

@@ -19,7 +19,7 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   SOFTWARE.
 */
-#if !defined(PROJECT_STATIC_LINK)
+#if defined(PROJECT_ENABLE_BACKWARD_CPP)
 #include "backward.hpp"
 #endif
 
@@ -36,7 +36,7 @@ std::size_t PROVIDER_INDEX{0U};
 #endif // _WIN32
 
 auto main(int argc, char **argv) -> int {
-#if !defined(PROJECT_STATIC_LINK)
+#if defined(PROJECT_ENABLE_BACKWARD_CPP)
   static backward::SignalHandling sh;
 #endif
 

scripts/env.sh

@@ -202,6 +202,7 @@ fi
 
 if [ "${PROJECT_STATIC_LINK}" == "ON" ]; then
   PROJECT_BUILD_SHARED_LIBS=OFF
+  PROJECT_ENABLE_BACKWARD_CPP=OFF
 else
   PROJECT_BUILD_SHARED_LIBS=ON
 fi

scripts/options.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 PROJECT_LIBRARIES=(
+  BACKWARD_CPP
   BOOST
   CPP_HTTPLIB
   CURL
@@ -17,6 +18,7 @@ PROJECT_LIBRARIES=(
 )
 
 declare -A PROJECT_CLEANUP
+PROJECT_CLEANUP[BACKWARD_CPP]="include/backward.hpp:src/backward.cpp"
 PROJECT_CLEANUP[BOOST]="boost_*"
 PROJECT_CLEANUP[CPP_HTTPLIB]="cpp-httplib-*"
 PROJECT_CLEANUP[CURL]="curl-*"