summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2011-08-14 13:37:24 (GMT)
committerStephen Kelly <steveire@gmail.com>2011-08-14 13:37:24 (GMT)
commit97392a7dd3ca141285e22507bfdae6c640512e76 (patch)
tree6458502da2df3f90e128dbf8892485d1e5c0011d
parent2aeab4f973144fe859d5751e969512a92ae08d96 (diff)
downloadCMake-97392a7dd3ca141285e22507bfdae6c640512e76.zip
CMake-97392a7dd3ca141285e22507bfdae6c640512e76.tar.gz
CMake-97392a7dd3ca141285e22507bfdae6c640512e76.tar.bz2
Fixup forgotten part of aed84517c942a4c40f493fcf997cdf6a047349f8
-rw-r--r--Modules/GenerateExportHeader.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 5b42b77..758eb25 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -178,10 +178,10 @@ macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY)
set(DEFINE_IMPORT)
set(DEFINE_NO_EXPORT)
- if (COMPILER_HAS_DEPRECATED_DECLSPEC)
- set(DEFINE_DEPRECATED "__declspec(deprecated)")
- elseif(COMPILER_HAS_DEPRECATED)
+ if (COMPILER_HAS_DEPRECATED_ATTR)
set(DEFINE_DEPRECATED "__attribute__ ((__deprecated__))")
+ elseif(COMPILER_HAS_DEPRECATED)
+ set(DEFINE_DEPRECATED "__declspec(deprecated)")
endif()
get_property(type TARGET ${TARGET_LIBRARY} PROPERTY TYPE)