[mlpack-git] master: the CMake flags are newline sensitive (648651e)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Mon Mar 30 16:40:11 EDT 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/8aa3abb00dd303a686db7dbc9896fef65961a738...648651ec58bd4d0bcf8a2389e9c35758148181cb
>---------------------------------------------------------------
commit 648651ec58bd4d0bcf8a2389e9c35758148181cb
Author: Stephen Tu <stephent at berkeley.edu>
Date: Mon Mar 30 16:39:51 2015 -0400
the CMake flags are newline sensitive
unbreaks build on OS X
>---------------------------------------------------------------
648651ec58bd4d0bcf8a2389e9c35758148181cb
CMakeLists.txt | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5079c9..ef8c912 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,10 +39,8 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
# Linking against libc++ instead of the GNU libstdc++ on OSX.
if(APPLE)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lm")
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}
- -stdlib=libc++ -lm")
- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}
- -stdlib=libc++ -lm")
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++ -lm")
+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -stdlib=libc++ -lm")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
else(APPLE)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lstdc++ -lm")
More information about the mlpack-git
mailing list