diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2010-11-20 12:01:17 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2010-11-20 12:01:17 +0100 |
| commit | 437dff80eedf0992d370555d9000022f26386b98 (patch) | |
| tree | 3c8aa0cc87bd72e87b90049910f0c350f5543910 /blas | |
| parent | 86474115f59b6b7946c3153de8eb49d9c1f01cd4 (diff) | |
fix issue 114: workaround cmake enable_language bug
Diffstat (limited to 'blas')
| -rw-r--r-- | blas/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | blas/testing/CMakeLists.txt | 5 |
2 files changed, 18 insertions, 7 deletions
diff --git a/blas/CMakeLists.txt b/blas/CMakeLists.txt index 2855009dd..8c8034294 100644 --- a/blas/CMakeLists.txt +++ b/blas/CMakeLists.txt @@ -1,4 +1,17 @@ -project(EigenBlas CXX Fortran) + +project(EigenBlas CXX) + +if((NOT DEFINED EIGEN_Fortran_COMPILER_WORKS) OR EIGEN_Fortran_COMPILER_WORKS) + + enable_language(Fortran OPTIONAL) + + if(CMAKE_Fortran_COMPILER_WORKS) + set(EIGEN_Fortran_COMPILER_WORKS TRUE CACHE INTERNAL "workaround cmake's enable_language issue") + else() + set(EIGEN_Fortran_COMPILER_WORKS FALSE CACHE INTERNAL "workaround cmake's enable_language issue") + endif() + +endif() add_custom_target(blas) @@ -19,4 +32,7 @@ install(TARGETS eigen_blas LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) -add_subdirectory(testing) + +if(CMAKE_Fortran_COMPILER_WORKS) + add_subdirectory(testing) +endif(CMAKE_Fortran_COMPILER_WORKS) diff --git a/blas/testing/CMakeLists.txt b/blas/testing/CMakeLists.txt index fcc596b9a..013f8e766 100644 --- a/blas/testing/CMakeLists.txt +++ b/blas/testing/CMakeLists.txt @@ -1,7 +1,4 @@ -# enable_language(Fortran) -# enable_testing() - macro(ei_add_blas_test testname) set(targetname ${testname}) @@ -17,8 +14,6 @@ macro(ei_add_blas_test testname) target_link_libraries(${targetname} ${EXTERNAL_LIBS}) -# add_test(${testname} "${targetname}" < ../${testname}.dat) - add_test(${testname} "${Eigen_SOURCE_DIR}/blas/testing/runblastest.sh" "${testname}" "${Eigen_SOURCE_DIR}/blas/testing/${testname}.dat") endmacro(ei_add_blas_test) |