[mlpack-git] master: Don't make OpenMP a requirement to build the source. (0547fb7)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Mon Jun 1 17:05:33 EDT 2015


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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/f07048b466066b80082a65a233af46f758b75568...0547fb75a32eda7e273651a7e6b6a258c5885a1e

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

commit 0547fb75a32eda7e273651a7e6b6a258c5885a1e
Author: Marcus Edel <marcus.edel at fu-berlin.de>
Date:   Mon Jun 1 23:04:38 2015 +0200

    Don't make OpenMP a requirement to build the source.


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

0547fb75a32eda7e273651a7e6b6a258c5885a1e
 CMakeLists.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2949dc8..062a4f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -249,13 +249,12 @@ endif (MSVC)
 # library.
 add_definitions(-DBOOST_TEST_DYN_LINK)
 
-# We require OpenMP now.
-find_package(OpenMP REQUIRED)
+# Detect OpenMP support in a compiler. If the compiler supports OpenMP, the
+# flags to compile with OpenMP are returned and added.
+find_package(OpenMP)
 if (OPENMP_FOUND)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-#  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}
-#      ${OpenMP_EXE_LINKER_FLAGS}")
 endif (OPENMP_FOUND)
 
 # Create a 'distclean' target in case the user is using an in-source build for



More information about the mlpack-git mailing list