From: Peter Kümmel Date: Sat, 19 Apr 2008 09:08:29 +0000 (+0000) Subject: cmake: skip configure checks only for msvc X-Git-Tag: 1.6.10~5122 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=527d3ac174c679c93649ecb0471540ed2775b0b1;p=lyx.git cmake: skip configure checks only for msvc git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24341 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index 1a70bda6e6..a4e048d6b2 100644 --- a/development/cmake/CMakeLists.txt +++ b/development/cmake/CMakeLists.txt @@ -289,11 +289,11 @@ if(MSVC) endif() # compiler tests, config.h generation -if(UNIX OR CONFIGURECHECKS) +if(MSVC AND NOT CONFIGURECHECKS) + configure_file(configCompiler.h.msvc ${CMAKE_BINARY_DIR}/configCompiler.h) +else() include(ConfigureChecks.cmake) configure_file(configCompiler.h.cmake ${CMAKE_BINARY_DIR}/configCompiler.h) -else() - configure_file(configCompiler.h.msvc ${CMAKE_BINARY_DIR}/configCompiler.h) endif() configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)