From: <ai...@us...> - 2013-12-09 13:51:20
|
Revision: 12829 http://sourceforge.net/p/plplot/code/12829 Author: airwin Date: 2013-12-09 13:51:15 +0000 (Mon, 09 Dec 2013) Log Message: ----------- Make sure MSYS_PLATFORM is off for Cygwin in all cases. Modified Paths: -------------- trunk/cmake/epa_build/CMakeLists.txt Modified: trunk/cmake/epa_build/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/CMakeLists.txt 2013-12-09 13:41:35 UTC (rev 12828) +++ trunk/cmake/epa_build/CMakeLists.txt 2013-12-09 13:51:15 UTC (rev 12829) @@ -51,11 +51,13 @@ find_program(MINGW_GET_EXECUTABLE mingw-get) find_program(BASH_EXECUTABLE bash) -if(MINGW_GET_EXECUTABLE AND BASH_EXECUTABLE) + +if(MINGW_GET_EXECUTABLE AND BASH_EXECUTABLE AND NOT CYGWIN) set(MSYS_PLATFORM ON) -else(MINGW_GET_EXECUTABLE AND BASH_EXECUTABLE) +else(MINGW_GET_EXECUTABLE AND BASH_EXECUTABLE AND NOT CYGWIN) set(MSYS_PLATFORM OFF) -endif(MINGW_GET_EXECUTABLE AND BASH_EXECUTABLE) +endif(MINGW_GET_EXECUTABLE AND BASH_EXECUTABLE AND NOT CYGWIN) + message(STATUS "WIN32 = ${WIN32}") message(STATUS "MINGW = ${MINGW}") message(STATUS "MSYS = ${MSYS}") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |