diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2008-12-17 17:50:43 +0000 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2008-12-17 17:50:43 +0000 |
| commit | 4cb63808d43e2ddd4d01f6378cb50af792cf44bd (patch) | |
| tree | 2336c479efb217480752cd0a4f599e040ec02afb /test | |
| parent | c98fe0185e3e46b3877a96ebe5f091e61bf1db04 (diff) | |
some cmake fixes for windows and GSL
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | test/main.h | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 366185e42..e9a5eb14d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -2,6 +2,8 @@ find_package(GSL) if(GSL_FOUND) add_definitions("-DHAS_GSL") +else(GSL_FOUND) + set(GSL_LIBRARIES " ") endif(GSL_FOUND) set(SPARSE_LIBS "") @@ -24,7 +26,10 @@ else(CHOLMOD_FOUND) message("CHOLMOD not found, this optional backend won't be tested") endif(CHOLMOD_FOUND) -enable_language(Fortran OPTIONAL) +if(NOT WIN32) + enable_language(Fortran OPTIONAL) +endif(NOT WIN32) + find_package(Umfpack) if(UMFPACK_FOUND) add_definitions("-DEIGEN_UMFPACK_SUPPORT") diff --git a/test/main.h b/test/main.h index 73633687c..4c8b443d3 100644 --- a/test/main.h +++ b/test/main.h @@ -274,7 +274,7 @@ int main(int argc, char *argv[]) std::cout << "Argument " << argv[i] << " conflicting with a former argument" << std::endl; return 1; } - seed = strtoul(argv[i]+1, 0, 10); + seed = int(strtoul(argv[i]+1, 0, 10)); has_set_seed = true; bool ok = seed!=0; if(!ok) |