Merge branch 'tests-if-CYGWIN' into cygwin

This commit is contained in:
Brad King 2010-12-17 10:18:51 -05:00
commit 72db20fb25
2 changed files with 3 additions and 3 deletions

View File

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

View File

@ -62,7 +62,7 @@ SET_PROPERTY(TARGET pcShared PROPERTY RELEASE_POSTFIX -opt)
SET_PROPERTY(TARGET pcShared PROPERTY DEBUG_POSTFIX -dbg)
SET_PROPERTY(TARGET pcShared PROPERTY VERSION 1.2)
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>)
ENDIF()
ADD_EXECUTABLE(perconfig perconfig.c)