kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use if(CYGWIN) instead of if(WIN32 AND UNIX) 

CMake has defined CYGWIN on Cygwin for years, so we no longer need the
legacy form of the test.  Change based on patch from issue #10122.
This commit is contained in:
Brad King 2010-01-13 12:57:38 -05:00
parent da36cde059
commit fdbe16c1f4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/FindTclsh.cmake
View File

@ -20,9 +20,9 @@
# (To distributed this file outside of CMake, substitute the full # (To distributed this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
IF(WIN32 AND UNIX) IF(CYGWIN)
FIND_PROGRAM(TCL_TCLSH NAMES cygtclsh83 cygtclsh80) FIND_PROGRAM(TCL_TCLSH NAMES cygtclsh83 cygtclsh80)
ENDIF(WIN32 AND UNIX) ENDIF(CYGWIN)
GET_FILENAME_COMPONENT(TK_WISH_PATH "${TK_WISH}" PATH) GET_FILENAME_COMPONENT(TK_WISH_PATH "${TK_WISH}" PATH)
GET_FILENAME_COMPONENT(TK_WISH_PATH_PARENT "${TK_WISH_PATH}" PATH) GET_FILENAME_COMPONENT(TK_WISH_PATH_PARENT "${TK_WISH_PATH}" PATH)

4
Source/CMakeLists.txt
View File

@ -425,12 +425,12 @@ SET(CPACK_SRCS
CPack/cmCPackZIPGenerator.cxx CPack/cmCPackZIPGenerator.cxx
) )
IF(WIN32 AND UNIX) IF(CYGWIN)
SET(CPACK_SRCS ${CPACK_SRCS} SET(CPACK_SRCS ${CPACK_SRCS}
CPack/cmCPackCygwinBinaryGenerator.cxx CPack/cmCPackCygwinBinaryGenerator.cxx
CPack/cmCPackCygwinSourceGenerator.cxx CPack/cmCPackCygwinSourceGenerator.cxx
) )
ENDIF(WIN32 AND UNIX) ENDIF(CYGWIN)
IF(UNIX) IF(UNIX)
SET(CPACK_SRCS ${CPACK_SRCS} SET(CPACK_SRCS ${CPACK_SRCS}