From: Axel R. <ro...@us...> - 2008-03-07 17:22:57
|
Update of /cvsroot/sdif/SDIF In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5342/SDIF Modified Files: CMakeLists.txt Log Message: Properly handle cygwin/mingw compiler Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/sdif/SDIF/CMakeLists.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** CMakeLists.txt 3 Mar 2008 17:25:23 -0000 1.14 --- CMakeLists.txt 7 Mar 2008 17:22:51 -0000 1.15 *************** *** 68,72 **** IF("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") IF (WIN32) ! IF(CYGWIN AND NOT MINGW) OPTION(BUILD_MINGW "Build MingW Version" ON) IF(BUILD_MINGW) --- 68,72 ---- IF("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") IF (WIN32) ! IF(CMAKE_COMPILER_IS_CYGWIN) OPTION(BUILD_MINGW "Build MingW Version" ON) IF(BUILD_MINGW) *************** *** 78,82 **** LINK_LIBRARIES(-mno-cygwin) ENDIF(BUILD_MINGW) ! ENDIF(CYGWIN AND NOT MINGW) IF(MSVC) # for visual c++ 2005, don't show deprecated function warnings --- 78,82 ---- LINK_LIBRARIES(-mno-cygwin) ENDIF(BUILD_MINGW) ! ENDIF(CMAKE_COMPILER_IS_CYGWIN) IF(MSVC) # for visual c++ 2005, don't show deprecated function warnings *************** *** 89,93 **** IF(CMAKE_COMPILER_IS_GNUCXX ) ! IF(NOT CYGWIN AND NOT MINGW) INCLUDE( CheckCXXCompilerFlag) CHECK_CXX_COMPILER_FLAG("-fvisibility=hidden" GCC_HAS_VISIBILITY) --- 89,93 ---- IF(CMAKE_COMPILER_IS_GNUCXX ) ! IF(NOT WIN32) INCLUDE( CheckCXXCompilerFlag) CHECK_CXX_COMPILER_FLAG("-fvisibility=hidden" GCC_HAS_VISIBILITY) *************** *** 95,99 **** ADD_DEFINITIONS(-DGCC_HAS_VISIBILITY -fvisibility=hidden) ENDIF(GCC_HAS_VISIBILITY) ! ENDIF(NOT CYGWIN AND NOT MINGW) ENDIF(CMAKE_COMPILER_IS_GNUCXX) ENDIF("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") --- 95,99 ---- ADD_DEFINITIONS(-DGCC_HAS_VISIBILITY -fvisibility=hidden) ENDIF(GCC_HAS_VISIBILITY) ! ENDIF(NOT WIN32) ENDIF(CMAKE_COMPILER_IS_GNUCXX) ENDIF("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") *************** *** 297,303 **** ENDIF(CMAKE_OSX_SYSROOT) ENDIF(APPLE) ! IF(CYGWIN) MESSAGE(STATUS "Use mingw (BUILD_MINGW) : ${BUILD_MINGW}") ! ENDIF(CYGWIN) MESSAGE(STATUS "sdif installation summary:") --- 297,303 ---- ENDIF(CMAKE_OSX_SYSROOT) ENDIF(APPLE) ! IF(CMAKE_COMPILER_IS_CYGWIN) MESSAGE(STATUS "Use mingw (BUILD_MINGW) : ${BUILD_MINGW}") ! ENDIF(CMAKE_COMPILER_IS_CYGWIN) MESSAGE(STATUS "sdif installation summary:") |