From d89e238e6c4b22fe3fde0f8e1e7987fb05f13aeb Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 17 Dec 2010 09:46:24 -0500 Subject: [PATCH] Cygwin: Fix tests to check CYGWIN instead of WIN32 Use "UNIX AND NOT CYGWIN" to detect a "soname" platform. Use "WIN32 OR CYGWIN" to detect a "DLL" platform. --- Tests/Jump/Library/Shared/CMakeLists.txt | 4 ++-- Tests/Testing/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/Jump/Library/Shared/CMakeLists.txt b/Tests/Jump/Library/Shared/CMakeLists.txt index 46d4d368c..44405770f 100644 --- a/Tests/Jump/Library/Shared/CMakeLists.txt +++ b/Tests/Jump/Library/Shared/CMakeLists.txt @@ -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) diff --git a/Tests/Testing/CMakeLists.txt b/Tests/Testing/CMakeLists.txt index f85740705..9e7a637ab 100644 --- a/Tests/Testing/CMakeLists.txt +++ b/Tests/Testing/CMakeLists.txt @@ -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=$) ENDIF() ADD_EXECUTABLE(perconfig perconfig.c)