From 664f2d450890eefa04b2ddfc826f5ab4cd116a57 Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Thu, 29 Apr 2010 08:04:42 -0400 Subject: [PATCH] dont try passing --version to qcc --- cmake/EigenTesting.cmake | 7 ------- doc/I00_CustomizingEigen.dox | 2 +- test/CMakeLists.txt | 9 +++++++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/cmake/EigenTesting.cmake b/cmake/EigenTesting.cmake index 4b2ee9f6f..430ade207 100644 --- a/cmake/EigenTesting.cmake +++ b/cmake/EigenTesting.cmake @@ -208,13 +208,6 @@ macro(ei_testing_print_summary) endif() # vectorization / alignment options message("\n${EIGEN_TESTING_SUMMARY}") - # message("CXX: ${CMAKE_CXX_COMPILER}") - # if(CMAKE_COMPILER_IS_GNUCXX) - # execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version COMMAND head -n 1 OUTPUT_VARIABLE EIGEN_CXX_VERSION_STRING OUTPUT_STRIP_TRAILING_WHITESPACE) - # message("CXX_VERSION: ${EIGEN_CXX_VERSION_STRING}") - # endif(CMAKE_COMPILER_IS_GNUCXX) - # message("CXX_FLAGS: ${CMAKE_CXX_FLAGS}") - # message("Sparse lib flags: ${SPARSE_LIBS}") message("************************************************************") diff --git a/doc/I00_CustomizingEigen.dox b/doc/I00_CustomizingEigen.dox index afeaabe47..cc4218f0c 100644 --- a/doc/I00_CustomizingEigen.dox +++ b/doc/I00_CustomizingEigen.dox @@ -14,7 +14,7 @@ Eigen can be extended in several ways, for instance, by defining global methods, In this section we will see how to add custom methods to MatrixBase. Since all expressions and matrix types inherit MatrixBase, adding a method to MatrixBase make it immediately available to all expressions ! A typical use case is, for instance, to make Eigen compatible with another API. -You certainly know that in C++ it is not possible to add methods to an extending class. So how that's possible ? Here the trick is to include in the declaration of MatrixBase a file defined by the preprocessor token \c EIGEN_MATRIXBASE_PLUGIN: +You certainly know that in C++ it is not possible to add methods to an existing class. So how that's possible ? Here the trick is to include in the declaration of MatrixBase a file defined by the preprocessor token \c EIGEN_MATRIXBASE_PLUGIN: \code class MatrixBase { // ... diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f46e4304f..b43a5c56d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -179,10 +179,15 @@ ei_add_test(nesting_ops "${CMAKE_CXX_FLAGS_DEBUG}") ei_add_test(prec_inverse_4x4) +string(TOLOWER "${CMAKE_CXX_COMPILER}" cmake_cxx_compiler_tolower) +if(cmake_cxx_compiler_tolower MATCHES "qcc") + set(CXX_IS_QCC "ON") +endif() + ei_add_property(EIGEN_TESTING_SUMMARY "CXX: ${CMAKE_CXX_COMPILER}\n") -if(CMAKE_COMPILER_IS_GNUCXX) +if(CMAKE_COMPILER_IS_GNUCXX AND NOT CXX_IS_QCC) execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version COMMAND head -n 1 OUTPUT_VARIABLE EIGEN_CXX_VERSION_STRING OUTPUT_STRIP_TRAILING_WHITESPACE) ei_add_property(EIGEN_TESTING_SUMMARY "CXX_VERSION: ${EIGEN_CXX_VERSION_STRING}\n") -endif(CMAKE_COMPILER_IS_GNUCXX) +endif() ei_add_property(EIGEN_TESTING_SUMMARY "CXX_FLAGS: ${CMAKE_CXX_FLAGS}\n") ei_add_property(EIGEN_TESTING_SUMMARY "Sparse lib flags: ${SPARSE_LIBS}\n")