[mlpack-svn] r15213 - in mlpack/trunk/src/mlpack: methods tests
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Fri Jun 7 16:13:50 EDT 2013
Author: rcurtin
Date: 2013-06-07 16:13:49 -0400 (Fri, 07 Jun 2013)
New Revision: 15213
Modified:
mlpack/trunk/src/mlpack/methods/CMakeLists.txt
mlpack/trunk/src/mlpack/tests/CMakeLists.txt
Log:
Yeah, well, it's not like anything was going to fix the Windows build anyway.
Now it crashes in some other way.
Modified: mlpack/trunk/src/mlpack/methods/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/methods/CMakeLists.txt 2013-06-07 19:51:16 UTC (rev 15212)
+++ mlpack/trunk/src/mlpack/methods/CMakeLists.txt 2013-06-07 20:13:49 UTC (rev 15213)
@@ -1,5 +1,6 @@
-## Recurse into different methods.
+# Recurse into each method mlpack provides.
set(DIRS
+ det
emst
fastmks
gmm
@@ -21,10 +22,6 @@
rann
sparse_coding
)
-# Density estimation trees fail on Windows.
-if (NOT WIN32)
- set(DIRS ${DIRS} det)
-endif (NOT WIN32)
foreach(dir ${DIRS})
add_subdirectory(${dir})
Modified: mlpack/trunk/src/mlpack/tests/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/tests/CMakeLists.txt 2013-06-07 19:51:16 UTC (rev 15212)
+++ mlpack/trunk/src/mlpack/tests/CMakeLists.txt 2013-06-07 20:13:49 UTC (rev 15213)
@@ -1,5 +1,5 @@
# MLPACK test executable.
-set(TEST_SOURCES
+add_executable(mlpack_test
mlpack_test.cpp
allkfn_test.cpp
allknn_test.cpp
@@ -7,6 +7,7 @@
arma_extend_test.cpp
aug_lagrangian_test.cpp
cli_test.cpp
+ det_test.cpp
distribution_test.cpp
emst_test.cpp
fastmks_test.cpp
@@ -37,13 +38,6 @@
tree_traits_test.cpp
union_find_test.cpp
)
-# On Windows, we don't include the test for density estimation trees.
-set(TEST_SOURCES ${TEST_SOURCES} det_test.cpp)
-
-add_executable(mlpack_test
- ${TEST_SOURCES}
-)
-
# Link dependencies of test executable.
target_link_libraries(mlpack_test
mlpack
More information about the mlpack-svn
mailing list