diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-21 19:05:53 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-12-21 19:05:53 (GMT) |
| commit | bc92c842317ea89e0785ed221adf28aa54319232 (patch) | |
| tree | d597949a93378e2eb8910dfa407e065d5ae25d99 /Tests | |
| parent | b44632ef6f41cb69bea375d7025f3410c0df17b0 (diff) | |
| parent | 853de2ed1288dbf891778db30653927d0e223a44 (diff) | |
| download | CMake-bc92c842317ea89e0785ed221adf28aa54319232.zip CMake-bc92c842317ea89e0785ed221adf28aa54319232.tar.gz CMake-bc92c842317ea89e0785ed221adf28aa54319232.tar.bz2 | |
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
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Jump/Library/Shared/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/PerConfig/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/PerConfig/CMakeLists.txt b/Tests/PerConfig/CMakeLists.txt index 7b7bf2e..3a473b8 100644 --- a/Tests/PerConfig/CMakeLists.txt +++ b/Tests/PerConfig/CMakeLists.txt @@ -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 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) |