diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-31 13:48:26 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-31 13:48:26 (GMT) |
| commit | 97db5c567894c253173ab45c919925ce010ab05e (patch) | |
| tree | e25e894a59180ef95f344b692eda29338a52afb0 | |
| parent | a036a4160597f83c13d2e513e2240e5a57b19a38 (diff) | |
| parent | 3e2865b46744e543af3045331b31b94df2ebe1ad (diff) | |
| download | CMake-97db5c567894c253173ab45c919925ce010ab05e.zip CMake-97db5c567894c253173ab45c919925ce010ab05e.tar.gz CMake-97db5c567894c253173ab45c919925ce010ab05e.tar.bz2 | |
Merge topic 'GenerateExportHeader-cygwin-dllexport'
3e2865b4 GenerateExportHeader: Use dllexport/dllimport on Cygwin
| -rw-r--r-- | Modules/GenerateExportHeader.cmake | 2 | ||||
| -rw-r--r-- | Tests/Module/GenerateExportHeader/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake index aab29ea..8205425 100644 --- a/Modules/GenerateExportHeader.cmake +++ b/Modules/GenerateExportHeader.cmake @@ -268,7 +268,7 @@ macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY) get_property(type TARGET ${TARGET_LIBRARY} PROPERTY TYPE) if(NOT ${type} STREQUAL "STATIC_LIBRARY") - if(WIN32) + if(WIN32 OR CYGWIN) set(DEFINE_EXPORT "__declspec(dllexport)") set(DEFINE_IMPORT "__declspec(dllimport)") elseif(COMPILER_HAS_HIDDEN_VISIBILITY AND USE_COMPILER_HIDDEN_VISIBILITY) diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportHeader/CMakeLists.txt index b52c44d..8cd25a4 100644 --- a/Tests/Module/GenerateExportHeader/CMakeLists.txt +++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt @@ -106,10 +106,10 @@ endif() add_executable(GenerateExportHeader exportheader_test.cpp) target_link_libraries(GenerateExportHeader ${link_libraries}) -if (WIN32) +if (WIN32 OR CYGWIN) if(MSVC AND COMPILER_HAS_DEPRECATED) set(_platform Win32) - elseif(MINGW AND COMPILER_HAS_DEPRECATED) + elseif((MINGW OR CYGWIN) AND COMPILER_HAS_DEPRECATED) set(_platform MinGW) else() set(_platform WinEmpty) |