[mlpack-svn] r10907 - in mlpack/trunk: . src/mlpack

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: 2011-12-20 11:28:12 -0500 (Tue, 20 Dec 2011)
New Revision: 10907

Modified:
   mlpack/trunk/CMakeLists.txt
   mlpack/trunk/src/mlpack/CMakeLists.txt
Log:
Smarter linking of MLPACK against Boost.


Modified: mlpack/trunk/CMakeLists.txt
===================================================================
--- mlpack/trunk/CMakeLists.txt	2011-12-20 16:27:50 UTC (rev 10906)
+++ mlpack/trunk/CMakeLists.txt	2011-12-20 16:28:12 UTC (rev 10907)
@@ -42,6 +42,7 @@
 set(Boost_ADDITIONAL_VERSIONS
   "1.41" "1.41.0" "1.42" "1.42.0" "1.43" "1.43.0"
   "1.44" "1.44.0" "1.45.0")
+set(BOOST_LIBS "boost_math_c99" "boost_program_options")
 find_package(Boost COMPONENTS
   math_c99
   program_options
@@ -54,6 +55,7 @@
   find_package(Boost COMPONENTS
   random
   REQUIRED)
+  set(BOOST_LIBS ${BOOST_LIBS} "boost_random")
 endif(Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION GREATER 45)
 
 

Modified: mlpack/trunk/src/mlpack/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/CMakeLists.txt	2011-12-20 16:27:50 UTC (rev 10906)
+++ mlpack/trunk/src/mlpack/CMakeLists.txt	2011-12-20 16:28:12 UTC (rev 10907)
@@ -20,8 +20,7 @@
   armadillo
   lapack
   blas
-  boost_program_options
-  boost_random
+  ${BOOST_LIBS}
   xml2
 )
 set_target_properties(mlpack