kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Another attempt to fix the tests on Borland.

This commit is contained in:
Stephen Kelly 2011-08-10 21:43:16 +02:00
parent bab4a22036
commit fc3772edc9
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Modules/GenerateExportHeader.cmake
View File

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