aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2009-10-04 20:27:44 -0400
committerGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2009-10-04 20:27:44 -0400
commitb78b2ede5f6156c8898c152335176cbd47c34bdb (patch)
tree236ca51d947d428139e9c51dfb888349f298b872
parent7956fc49a0b280b2a506b614eb500d8287748d03 (diff)
finally, the right fix: set CTEST_BUILD_TARGET.
So this is the come-back of btest target, and the default target is empty again.
-rw-r--r--CMakeLists.txt20
-rw-r--r--CTestConfig.cmake1
-rw-r--r--INSTALL8
-rw-r--r--cmake/EigenTesting.cmake1
-rw-r--r--test/CMakeLists.txt2
5 files changed, 10 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fac4fa1f..c3b63bc55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,7 +124,7 @@ add_subdirectory(doc EXCLUDE_FROM_ALL)
include(CTest)
enable_testing() # must be called from the root CMakeLists, see man page
-add_subdirectory(test) # can't do EXCLUDE_FROM_ALL here, breaks CTest
+add_subdirectory(test EXCLUDE_FROM_ALL) # can't do EXCLUDE_FROM_ALL here, breaks CTest
add_subdirectory(unsupported)
@@ -145,24 +145,12 @@ message("--------------+--------------------------------------------------------
message("Command | Description")
message("--------------+----------------------------------------------------------------")
message("make install | Install to ${CMAKE_INSTALL_PREFIX}")
-message(" | To change that: cmake . -DCMAKE_INSTALL_PREFIX=yourpath")
-message("make | Build the unit tests")
-message(" | * That's not needed if you just want to install Eigen!")
-message(" | * That takes lots of memory! Easy on the -j option!")
+message(" | * To change that: cmake . -DCMAKE_INSTALL_PREFIX=yourpath")
+message("make btest | Build the unit tests")
+message(" | * That takes lots of memory! Easy on the -j option")
message("make test | Build and run the unit tests (using CTest)")
message("make test_qr | Build a specific test, here test_qr. To run it: test/test_qr")
message("make debug_qr | Build a test with full debug info. To run it: test/debug_qr")
message("make blas | Build BLAS library (not the same thing as Eigen)")
message("make doc | Generate the API documentation, requires Doxygen & LaTeX")
message("--------------+----------------------------------------------------------------")
-
-if(NOT EIGEN_CMAKE_ALREADY_RUN)
- unset(EIGEN_CMAKE_ALREADY_RUN CACHE) # in case it was manually set to OFF in cache
- set(EIGEN_CMAKE_ALREADY_RUN "ON" CACHE BOOL "Set to ON if CMake has already run here.")
- message("")
- message("First-time tip:")
- message("")
- message("If you just want to install Eigen, do 'make install' right away.")
- message("No need to do 'make' before. See INSTALL file for more details.")
- message("")
-endif(NOT EIGEN_CMAKE_ALREADY_RUN)
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 0ccd5a1ad..897a9a854 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -11,3 +11,4 @@ set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "eigen.tuxfamily.org")
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=Eigen")
set(CTEST_DROP_SITE_CDASH TRUE)
+set(CTEST_BUILD_TARGET "btest")
diff --git a/INSTALL b/INSTALL
index 5face1323..4f717e9c2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,11 +4,9 @@ Installation instructions for Eigen
Explanation before starting
***************************
-It is very important to understand that Eigen consists only of header files,
-hence there is nothing to compile before you can use it. Moreover, these
-header files do not depend on your platform, they are the same for
-everybody.
-
+Eigen consists only of header files, hence there is nothing to compile
+before you can use it. Moreover, these header files do not depend on your
+platform, they are the same for everybody.
Method 1. Installing without using CMake
****************************************
diff --git a/cmake/EigenTesting.cmake b/cmake/EigenTesting.cmake
index 337e298c0..0ea6dddb4 100644
--- a/cmake/EigenTesting.cmake
+++ b/cmake/EigenTesting.cmake
@@ -44,6 +44,7 @@ macro(ei_add_test testname)
set(filename ${testname}.cpp)
add_executable(${targetname} ${filename})
+ add_dependencies(btest ${targetname})
add_executable(${debug_targetname} ${filename})
if(NOT EIGEN_NO_ASSERTION_CHECKING)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f8fb5ad18..b46971493 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,5 +1,5 @@
project(EigenTesting)
-
+add_custom_target(btest)
include(EigenTesting)
ei_init_testing()