[mlpack-svn] r11324 - in mlpack/trunk: . src/mlpack src/mlpack/methods/emst src/mlpack/methods/gmm src/mlpack/methods/hmm src/mlpack/methods/kernel_pca src/mlpack/methods/kmeans src/mlpack/methods/lars src/mlpack/methods/linear_regression src/mlpack/methods/mvu src/mlpack/methods/naive_bayes src/mlpack/methods/nca src/mlpack/methods/neighbor_search src/mlpack/methods/pca src/mlpack/methods/radical
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Wed Feb 1 12:38:23 EST 2012
Author: rcurtin
Date: 2012-02-01 12:38:23 -0500 (Wed, 01 Feb 2012)
New Revision: 11324
Modified:
mlpack/trunk/CMakeLists.txt
mlpack/trunk/src/mlpack/CMakeLists.txt
mlpack/trunk/src/mlpack/methods/emst/CMakeLists.txt
mlpack/trunk/src/mlpack/methods/gmm/CMakeLists.txt
mlpack/trunk/src/mlpack/methods/hmm/CMakeLists.txt
mlpack/trunk/src/mlpack/methods/kernel_pca/CMakeLists.txt
mlpack/trunk/src/mlpack/methods/kmeans/CMakeLists.txt
mlpack/trunk/src/mlpack/methods/lars/CMakeLists.txt
mlpack/trunk/src/mlpack/methods/linear_regression/CMakeLists.txt
mlpack/trunk/src/mlpack/methods/mvu/CMakeLists.txt
mlpack/trunk/src/mlpack/methods/naive_bayes/CMakeLists.txt
mlpack/trunk/src/mlpack/methods/nca/CMakeLists.txt
mlpack/trunk/src/mlpack/methods/neighbor_search/CMakeLists.txt
mlpack/trunk/src/mlpack/methods/pca/CMakeLists.txt
mlpack/trunk/src/mlpack/methods/radical/CMakeLists.txt
Log:
Actually write the "correct" installation commands, so that RPATH gets stripped
at install time.
Modified: mlpack/trunk/CMakeLists.txt
===================================================================
--- mlpack/trunk/CMakeLists.txt 2012-02-01 16:47:36 UTC (rev 11323)
+++ mlpack/trunk/CMakeLists.txt 2012-02-01 17:38:23 UTC (rev 11324)
@@ -58,7 +58,6 @@
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" ON)
option(PROFILE "Compile with profiling information" ON)
@@ -101,7 +100,6 @@
include(CMake/TargetDistclean.cmake OPTIONAL)
include_directories(${CMAKE_SOURCE_DIR})
-#TODO link_directories()
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/)
Modified: mlpack/trunk/src/mlpack/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/CMakeLists.txt 2012-02-01 16:47:36 UTC (rev 11323)
+++ mlpack/trunk/src/mlpack/CMakeLists.txt 2012-02-01 17:38:23 UTC (rev 11324)
@@ -51,22 +51,13 @@
# collected to include/.
install(DIRECTORY ${CMAKE_BINARY_DIR}/include/mlpack DESTINATION include)
+# Set generated executables to be installed. Unfortunately they must manually
+# be entered...
install(TARGETS mlpack
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib)
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib)
-# Set generated executables to be installed.
-# This will have some odd effects if the user has placed anything else in bin/,
-# but I think we can just hope that they haven't. At least, an auto-builder
-# won't do that...
-install(DIRECTORY ${CMAKE_BINARY_DIR}/bin/
- DESTINATION bin
- USE_SOURCE_PERMISSIONS
- COMPONENT mlpack
- FILES_MATCHING
- PATTERN *[^_test])
-
# For 'make test'.
add_custom_target(test
${CMAKE_BINARY_DIR}/bin/mlpack_test
Modified: mlpack/trunk/src/mlpack/methods/emst/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/methods/emst/CMakeLists.txt 2012-02-01 16:47:36 UTC (rev 11323)
+++ mlpack/trunk/src/mlpack/methods/emst/CMakeLists.txt 2012-02-01 17:38:23 UTC (rev 11324)
@@ -26,3 +26,4 @@
target_link_libraries(emst
mlpack
)
+install(TARGETS emst RUNTIME DESTINATION bin)
Modified: mlpack/trunk/src/mlpack/methods/gmm/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/methods/gmm/CMakeLists.txt 2012-02-01 16:47:36 UTC (rev 11323)
+++ mlpack/trunk/src/mlpack/methods/gmm/CMakeLists.txt 2012-02-01 17:38:23 UTC (rev 11324)
@@ -26,3 +26,4 @@
target_link_libraries(gmm
mlpack
)
+install(TARGETS gmm RUNTIME DESTINATION bin)
Modified: mlpack/trunk/src/mlpack/methods/hmm/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/CMakeLists.txt 2012-02-01 16:47:36 UTC (rev 11323)
+++ mlpack/trunk/src/mlpack/methods/hmm/CMakeLists.txt 2012-02-01 17:38:23 UTC (rev 11324)
@@ -45,3 +45,6 @@
target_link_libraries(hmm_generate
mlpack
)
+
+install(TARGETS hmm_train hmm_loglik hmm_viterbi hmm_generate
+ RUNTIME DESTINATION bin)
Modified: mlpack/trunk/src/mlpack/methods/kernel_pca/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/methods/kernel_pca/CMakeLists.txt 2012-02-01 16:47:36 UTC (rev 11323)
+++ mlpack/trunk/src/mlpack/methods/kernel_pca/CMakeLists.txt 2012-02-01 17:38:23 UTC (rev 11324)
@@ -19,8 +19,7 @@
add_executable(kernel_pca
kernel_pca_main.cpp
)
-
target_link_libraries(kernel_pca
mlpack
)
-
+install(TARGETS kernel_pca RUNTIME DESTINATION bin)
Modified: mlpack/trunk/src/mlpack/methods/kmeans/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/methods/kmeans/CMakeLists.txt 2012-02-01 16:47:36 UTC (rev 11323)
+++ mlpack/trunk/src/mlpack/methods/kmeans/CMakeLists.txt 2012-02-01 17:38:23 UTC (rev 11324)
@@ -27,3 +27,4 @@
target_link_libraries(kmeans
mlpack
)
+install(TARGETS kmeans RUNTIME DESTINATION bin)
Modified: mlpack/trunk/src/mlpack/methods/lars/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/methods/lars/CMakeLists.txt 2012-02-01 16:47:36 UTC (rev 11323)
+++ mlpack/trunk/src/mlpack/methods/lars/CMakeLists.txt 2012-02-01 17:38:23 UTC (rev 11324)
@@ -18,7 +18,7 @@
add_executable(lars
lars_main.cpp
)
-
target_link_libraries(lars
mlpack
)
+install(TARGETS lars RUNTIME DESTINATION bin)
Modified: mlpack/trunk/src/mlpack/methods/linear_regression/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/methods/linear_regression/CMakeLists.txt 2012-02-01 16:47:36 UTC (rev 11323)
+++ mlpack/trunk/src/mlpack/methods/linear_regression/CMakeLists.txt 2012-02-01 17:38:23 UTC (rev 11324)
@@ -23,3 +23,4 @@
target_link_libraries(linear_regression
mlpack
)
+install(TARGETS linear_regression RUNTIME DESTINATION bin)
Modified: mlpack/trunk/src/mlpack/methods/mvu/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/methods/mvu/CMakeLists.txt 2012-02-01 16:47:36 UTC (rev 11323)
+++ mlpack/trunk/src/mlpack/methods/mvu/CMakeLists.txt 2012-02-01 17:38:23 UTC (rev 11324)
@@ -24,3 +24,4 @@
target_link_libraries(mvu
mlpack
)
+install(TARGETS mvu RUNTIME DESTINATION bin)
Modified: mlpack/trunk/src/mlpack/methods/naive_bayes/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/methods/naive_bayes/CMakeLists.txt 2012-02-01 16:47:36 UTC (rev 11323)
+++ mlpack/trunk/src/mlpack/methods/naive_bayes/CMakeLists.txt 2012-02-01 17:38:23 UTC (rev 11324)
@@ -22,3 +22,4 @@
target_link_libraries(nbc
mlpack
)
+install(TARGETS nbc RUNTIME DESTINATION bin)
Modified: mlpack/trunk/src/mlpack/methods/nca/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/methods/nca/CMakeLists.txt 2012-02-01 16:47:36 UTC (rev 11323)
+++ mlpack/trunk/src/mlpack/methods/nca/CMakeLists.txt 2012-02-01 17:38:23 UTC (rev 11324)
@@ -24,3 +24,4 @@
target_link_libraries(nca
mlpack
)
+install(TARGETS nca RUNTIME DESTINATION bin)
Modified: mlpack/trunk/src/mlpack/methods/neighbor_search/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/methods/neighbor_search/CMakeLists.txt 2012-02-01 16:47:36 UTC (rev 11323)
+++ mlpack/trunk/src/mlpack/methods/neighbor_search/CMakeLists.txt 2012-02-01 17:38:23 UTC (rev 11324)
@@ -36,3 +36,5 @@
target_link_libraries(allkfn
mlpack
)
+
+install(TARGETS allknn allkfn RUNTIME DESTINATION bin)
Modified: mlpack/trunk/src/mlpack/methods/pca/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/methods/pca/CMakeLists.txt 2012-02-01 16:47:36 UTC (rev 11323)
+++ mlpack/trunk/src/mlpack/methods/pca/CMakeLists.txt 2012-02-01 17:38:23 UTC (rev 11324)
@@ -22,3 +22,4 @@
target_link_libraries(pca
mlpack
)
+install(TARGETS pca RUNTIME DESTINATION bin)
Modified: mlpack/trunk/src/mlpack/methods/radical/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/methods/radical/CMakeLists.txt 2012-02-01 16:47:36 UTC (rev 11323)
+++ mlpack/trunk/src/mlpack/methods/radical/CMakeLists.txt 2012-02-01 17:38:23 UTC (rev 11324)
@@ -16,9 +16,9 @@
set(MLPACK_SRCS ${MLPACK_SRCS} ${DIR_SRCS} PARENT_SCOPE)
add_executable(radical
- radical_main.cpp
+ radical_main.cpp
)
-
target_link_libraries(radical
mlpack
)
+install(TARGETS radical RUNTIME DESTINATION bin)
More information about the mlpack-svn
mailing list