Skip to content

Commit

Permalink
finally, the right fix: set CTEST_BUILD_TARGET.
Browse files Browse the repository at this point in the history
So this is the come-back of btest target, and the default target is empty again.
  • Loading branch information
bjacob committed Oct 5, 2009
1 parent 174be54 commit cb6e609
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 22 deletions.
20 changes: 4 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)
1 change: 1 addition & 0 deletions CTestConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")
8 changes: 3 additions & 5 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -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
****************************************
Expand Down
1 change: 1 addition & 0 deletions cmake/EigenTesting.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project(EigenTesting)

add_custom_target(btest)
include(EigenTesting)
ei_init_testing()

Expand Down

0 comments on commit cb6e609

Please sign in to comment.