diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-17 14:46:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-12-17 14:46:24 (GMT) |
| commit | d89e238e6c4b22fe3fde0f8e1e7987fb05f13aeb (patch) | |
| tree | 91c170a808739e7aaa9049f6775e57ae5c267d2a | |
| parent | da0a8f7f448a6ebbf39f50199f661b63a1cdc261 (diff) | |
| download | CMake-d89e238e6c4b22fe3fde0f8e1e7987fb05f13aeb.zip CMake-d89e238e6c4b22fe3fde0f8e1e7987fb05f13aeb.tar.gz CMake-d89e238e6c4b22fe3fde0f8e1e7987fb05f13aeb.tar.bz2 | |
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.
| -rw-r--r-- | Tests/Jump/Library/Shared/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | 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 46d4d36..4440577 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 f857407..9e7a637 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=$<TARGET_SONAME_FILE:pcShared>) ENDIF() ADD_EXECUTABLE(perconfig perconfig.c) |