[mlpack-git] master: Link mlpack against backtrace, but not everything. (02a4f44)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Tue Mar 24 18:38:48 EDT 2015


Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/98fd81bd8477869fd45396404fdf5b2c3b32d83b...cbccdc78493a4db6cf6ebbf6442674bab8d9c22c

>---------------------------------------------------------------

commit 02a4f44aadb5ce36cf6139cde80bb9500d515230
Author: Ryan Curtin <ryan at ratml.org>
Date:   Tue Mar 24 18:27:03 2015 -0400

    Link mlpack against backtrace, but not everything.


>---------------------------------------------------------------

02a4f44aadb5ce36cf6139cde80bb9500d515230
 CMakeLists.txt            | 2 --
 src/mlpack/CMakeLists.txt | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae5d178..cf6e91f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,8 +65,6 @@ endif(CMAKE_COMPILER_IS_GNUCC AND PROFILE)
 find_package(Backtrace)
 if(Backtrace_FOUND)
   include_directories(${Backtrace_INCLUDE_DIRS})
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Backtrace_LIBRARIES}")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${Backtrace_LIBRARIES}")
 endif(Backtrace_FOUND)
 
 # Generate the backtrace header file.
diff --git a/src/mlpack/CMakeLists.txt b/src/mlpack/CMakeLists.txt
index 9092d4a..6070a41 100644
--- a/src/mlpack/CMakeLists.txt
+++ b/src/mlpack/CMakeLists.txt
@@ -41,6 +41,12 @@ if(UNIX AND NOT APPLE)
     target_link_libraries(mlpack rt)
 endif(UNIX AND NOT APPLE)
 
+# Log::Assert may require linking against whatever provides backtrace
+# functionality.
+if(Backtrace_FOUND)
+  target_link_libraries(mlpack ${Backtrace_LIBRARIES})
+endif(Backtrace_FOUND)
+
 # Collect all header files in the library.
 file(GLOB_RECURSE INCLUDE_H_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
 file(GLOB_RECURSE INCLUDE_HPP_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.hpp)



More information about the mlpack-git mailing list