From c754023e72dde59e5c8fce0d74c65437c2eccdd2 Mon Sep 17 00:00:00 2001 From: Hauke Heibel Date: Wed, 27 Feb 2013 15:54:27 +0100 Subject: Fixed MSVC dashboard (Experimental/Continuous) build scripts. --- cmake/EigenConfigureTesting.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cmake/EigenConfigureTesting.cmake') diff --git a/cmake/EigenConfigureTesting.cmake b/cmake/EigenConfigureTesting.cmake index cf8f32c01..6216a9009 100644 --- a/cmake/EigenConfigureTesting.cmake +++ b/cmake/EigenConfigureTesting.cmake @@ -27,10 +27,10 @@ include(CTest) # overwrite default DartConfiguration.tcl # The worarounds are different for each version of the MSVC IDE if(MSVC_IDE) - if(MSVC_VERSION EQUAL 1600) # MSVC 2010 + if(CMAKE_MAKE_PROGRAM_SAVE MATCHES "devenv") # devenv + set(EIGEN_MAKECOMMAND_PLACEHOLDER "${CMAKE_MAKE_PROGRAM_SAVE} Eigen.sln /build \"Release\" /project buildtests \n# ") + else() # msbuild set(EIGEN_MAKECOMMAND_PLACEHOLDER "${CMAKE_MAKE_PROGRAM_SAVE} buildtests.vcxproj /p:Configuration=\${CTEST_CONFIGURATION_TYPE} \n# ") - else() # MSVC 2008 (TODO check MSVC 2005) - set(EIGEN_MAKECOMMAND_PLACEHOLDER "${CMAKE_MAKE_PROGRAM_SAVE} Eigen.sln /build \"Release\" /project buildtests \n# ") endif() else() # for make and nmake -- cgit v1.2.3