diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-17 15:18:51 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-12-17 15:18:51 (GMT) |
| commit | 72db20fb2582f5409bde1e510969f3b715049660 (patch) | |
| tree | c6d73742df0dc10b3794f2e4574ef1d7135468df | |
| parent | 5adef168c28e301b9a2824a43b3a16359846e28c (diff) | |
| parent | d89e238e6c4b22fe3fde0f8e1e7987fb05f13aeb (diff) | |
| download | CMake-72db20fb2582f5409bde1e510969f3b715049660.zip CMake-72db20fb2582f5409bde1e510969f3b715049660.tar.gz CMake-72db20fb2582f5409bde1e510969f3b715049660.tar.bz2 | |
Merge branch 'tests-if-CYGWIN' into cygwin
| -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) |