[mlpack-svn] r10912 - in mlpack/tags/mlpack-1.0.0: . src/mlpack

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

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

Modified:
   mlpack/tags/mlpack-1.0.0/CMakeLists.txt
   mlpack/tags/mlpack-1.0.0/src/mlpack/CMakeLists.txt
Log:
Fix for Boost CMake configuration.


Modified: mlpack/tags/mlpack-1.0.0/CMakeLists.txt
===================================================================
--- mlpack/tags/mlpack-1.0.0/CMakeLists.txt	2011-12-20 18:20:49 UTC (rev 10911)
+++ mlpack/tags/mlpack-1.0.0/CMakeLists.txt	2011-12-21 01:11:36 UTC (rev 10912)
@@ -42,18 +42,26 @@
 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
   unit_test_framework
-  random
   REQUIRED) # May require math_tr1?
 
-option(WITH_OPTIMIZERS "Include optimization code." OFF)
+# We need to include Boost random, but only if newer than 1.45 (as of 1.46 it
+# became a separate package with its own linkable library object).
+if(Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION GREATER 45)
+  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)
 
+
 # Default to debugging mode for developers.
-option(DEBUG "Compile with debugging information" OFF)
-option(PROFILE "Compile with profiling information" OFF)
+option(DEBUG "Compile with debugging information" ON)
+option(PROFILE "Compile with profiling information" ON)
 option(ARMA_EXTRA_DEBUG "Compile with extra Armadillo debugging symbols." OFF)
 
 # This is as of yet unused.

Modified: mlpack/tags/mlpack-1.0.0/src/mlpack/CMakeLists.txt
===================================================================
--- mlpack/tags/mlpack-1.0.0/src/mlpack/CMakeLists.txt	2011-12-20 18:20:49 UTC (rev 10911)
+++ mlpack/tags/mlpack-1.0.0/src/mlpack/CMakeLists.txt	2011-12-21 01:11:36 UTC (rev 10912)
@@ -20,14 +20,13 @@
   armadillo
   lapack
   blas
-  boost_program_options
-  boost_random
+  ${BOOST_LIBS}
   xml2
 )
 set_target_properties(mlpack
   PROPERTIES
-  VERSION 1.0.0
-  SOVERSION 1.0.0
+  VERSION 0.99.0
+  SOVERSION 0.99.0
 )
 
 # Collect all header files in the library.