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

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)

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)