Another attempt to fix the tests on Borland.

Modules/GenerateExportHeader.cmake

@@ -148,8 +148,10 @@ macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY)
   set(DEFINE_IMPORT)
   set(DEFINE_NO_EXPORT)
 
-  if(WIN32 AND NOT (${CMAKE_CXX_COMPILER_ID} MATCHES Borland))
-    set(DEFINE_DEPRECATED "__declspec(deprecated)")
+  if(WIN32)
+    if (${CMAKE_CXX_COMPILER_ID} MATCHES Borland)
+      set(DEFINE_DEPRECATED "__declspec(deprecated)")
+    endif()
   else()
     set(DEFINE_DEPRECATED "__attribute__ ((__deprecated__))")
   endif()
@@ -157,9 +159,11 @@ macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY)
   get_property(type TARGET ${TARGET_LIBRARY} PROPERTY TYPE)
 
   if(NOT ${type} STREQUAL "STATIC_LIBRARY")
-    if(WIN32 AND NOT (${CMAKE_CXX_COMPILER_ID} MATCHES Borland))
-      set(DEFINE_EXPORT "__declspec(dllexport)")
-      set(DEFINE_IMPORT "__declspec(dllimport)")
+    if(WIN32)
+      if (NOT (${CMAKE_CXX_COMPILER_ID} MATCHES Borland))
+        set(DEFINE_EXPORT "__declspec(dllexport)")
+        set(DEFINE_IMPORT "__declspec(dllimport)")
+      endif()
     elseif(COMPILER_HAS_HIDDEN_VISIBILITY AND USE_COMPILER_HIDDEN_VISIBILITY)
       set(DEFINE_EXPORT "__attribute__((visibility(\"default\")))")
       set(DEFINE_IMPORT "__attribute__((visibility(\"default\")))")