Merge topic 'resolve/tests-if-CYGWIN'

853de2e Merge branch 'custom-command-generator-expressions' into resolve/tests-if-CYGWIN
d89e238 Cygwin: Fix tests to check CYGWIN instead of WIN32
This commit is contained in:
Brad King 2010-12-21 14:05:53 -05:00 committed by CMake Topic Stage
commit bc92c84231
2 changed files with 3 additions and 3 deletions

View File

@ -1,8 +1,8 @@
ADD_LIBRARY(jumpShared SHARED jumpShared.cxx) ADD_LIBRARY(jumpShared SHARED jumpShared.cxx)
IF(WIN32) IF(WIN32 OR CYGWIN)
SET(SHARED_MUST_BE_IN_EXE_DIR 1) SET(SHARED_MUST_BE_IN_EXE_DIR 1)
ENDIF(WIN32) ENDIF()
IF(APPLE) IF(APPLE)
SET(SHARED_MUST_BE_IN_EXE_DIR 1) SET(SHARED_MUST_BE_IN_EXE_DIR 1)

View File

@ -9,7 +9,7 @@ SET_PROPERTY(TARGET pcShared PROPERTY RELEASE_POSTFIX -opt)
SET_PROPERTY(TARGET pcShared PROPERTY DEBUG_POSTFIX -dbg) SET_PROPERTY(TARGET pcShared PROPERTY DEBUG_POSTFIX -dbg)
SET_PROPERTY(TARGET pcShared PROPERTY VERSION 1.2) SET_PROPERTY(TARGET pcShared PROPERTY VERSION 1.2)
SET_PROPERTY(TARGET pcShared PROPERTY SOVERSION 3) SET_PROPERTY(TARGET pcShared PROPERTY SOVERSION 3)
IF(NOT WIN32) IF(UNIX AND NOT CYGWIN)
SET(soname_file -DpcShared_soname_file=$<TARGET_SONAME_FILE:pcShared>) SET(soname_file -DpcShared_soname_file=$<TARGET_SONAME_FILE:pcShared>)
ENDIF() ENDIF()
ADD_EXECUTABLE(perconfig perconfig.c) ADD_EXECUTABLE(perconfig perconfig.c)