[mlpack-git] master: Merge branch 'cli_option' of https://github.com/xantares/mlpack into xantares-cli_option (3991cc2)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/cf2b62565078ffd3eb6c814bf37f286838afabae...28ae007678c8867122094fdf072793b227690404

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

commit 3991cc2c271e04500ec4f2580598bbcabfa25ca6
Merge: cf2b625 9cd5bec
Author: Ryan Curtin <ryan at ratml.org>
Date:   Mon Apr 18 08:55:07 2016 -0700

    Merge branch 'cli_option' of https://github.com/xantares/mlpack into xantares-cli_option


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

3991cc2c271e04500ec4f2580598bbcabfa25ca6
 CMakeLists.txt                                     |  1 +
 src/mlpack/methods/CMakeLists.txt                  | 13 ++++++++
 src/mlpack/methods/adaboost/CMakeLists.txt         |  8 +----
 src/mlpack/methods/cf/CMakeLists.txt               |  8 +----
 src/mlpack/methods/decision_stump/CMakeLists.txt   |  9 ++----
 src/mlpack/methods/det/CMakeLists.txt              | 10 +-----
 src/mlpack/methods/emst/CMakeLists.txt             |  9 ++----
 src/mlpack/methods/fastmks/CMakeLists.txt          | 10 ++----
 src/mlpack/methods/gmm/CMakeLists.txt              | 28 ++--------------
 src/mlpack/methods/hmm/CMakeLists.txt              | 37 +++-------------------
 src/mlpack/methods/hoeffding_trees/CMakeLists.txt  |  9 ++----
 src/mlpack/methods/kernel_pca/CMakeLists.txt       |  9 ++----
 src/mlpack/methods/kmeans/CMakeLists.txt           |  9 +-----
 src/mlpack/methods/lars/CMakeLists.txt             |  8 +----
 .../methods/linear_regression/CMakeLists.txt       |  9 ++----
 .../methods/local_coordinate_coding/CMakeLists.txt |  9 ++----
 ...c_main.cpp => local_coordinate_coding_main.cpp} |  0
 .../methods/logistic_regression/CMakeLists.txt     |  9 ++----
 src/mlpack/methods/lsh/CMakeLists.txt              |  8 +----
 src/mlpack/methods/mean_shift/CMakeLists.txt       |  9 +-----
 src/mlpack/methods/mvu/CMakeLists.txt              |  9 ++----
 src/mlpack/methods/naive_bayes/CMakeLists.txt      |  9 ++----
 src/mlpack/methods/nca/CMakeLists.txt              |  8 +----
 src/mlpack/methods/neighbor_search/CMakeLists.txt  | 16 ++--------
 src/mlpack/methods/nmf/CMakeLists.txt              |  8 +----
 src/mlpack/methods/pca/CMakeLists.txt              |  9 ++----
 src/mlpack/methods/perceptron/CMakeLists.txt       |  9 +-----
 src/mlpack/methods/radical/CMakeLists.txt          |  9 ++----
 src/mlpack/methods/range_search/CMakeLists.txt     |  9 ++----
 src/mlpack/methods/rann/CMakeLists.txt             |  8 +----
 .../methods/softmax_regression/CMakeLists.txt      |  8 +----
 src/mlpack/methods/sparse_coding/CMakeLists.txt    |  9 ++----
 32 files changed, 65 insertions(+), 258 deletions(-)

diff --cc src/mlpack/methods/neighbor_search/CMakeLists.txt
index 1a76797,dd26eeb..407ad6f
--- a/src/mlpack/methods/neighbor_search/CMakeLists.txt
+++ b/src/mlpack/methods/neighbor_search/CMakeLists.txt
@@@ -29,37 -29,6 +29,27 @@@ endforeach(
  # the parent scope).
  set(MLPACK_SRCS ${MLPACK_SRCS} ${DIR_SRCS} PARENT_SCOPE)
  
- add_executable(mlpack_knn
-   allknn_main.cpp
- )
- target_link_libraries(mlpack_knn
-   mlpack
- )
- 
- add_executable(mlpack_kfn
-   allkfn_main.cpp
- )
- target_link_libraries(mlpack_kfn
-   mlpack
- )
 -add_cli_executable(allknn)
 -add_cli_executable(allkfn)
++# Add mlpack_knn and mlpack_kfn executables.
++add_cli_executable(knn)
++add_cli_executable(kfn)
  
 +install(TARGETS mlpack_knn mlpack_kfn RUNTIME DESTINATION bin)
 +
 +# -- mlpack_knn/mlpack_kfn compatibility start --
 +# Make a copy of mlpack_knn/mlpack_kfn both on Windows and *unix for
 +# compatibility.  This should be removed by mlpack 3.0.0.
 +get_property(knn_loc TARGET mlpack_knn PROPERTY LOCATION)
 +get_filename_component(knn_ext ${knn_loc} EXT)
 +
 +add_custom_command(TARGET mlpack_knn POST_BUILD
 +    COMMAND ${CMAKE_COMMAND} -E copy
 +    $<TARGET_FILE:mlpack_knn> $<TARGET_FILE_DIR:mlpack_knn>/mlpack_allknn${knn_ext}
 +)
 +
 +get_property(kfn_loc TARGET mlpack_kfn PROPERTY LOCATION)
 +get_filename_component(kfn_ext ${kfn_loc} EXT)
 +
 +add_custom_command(TARGET mlpack_kfn POST_BUILD
 +    COMMAND ${CMAKE_COMMAND} -E copy
 +    $<TARGET_FILE:mlpack_kfn> $<TARGET_FILE_DIR:mlpack_kfn>/mlpack_allkfn${kfn_ext}
 +)