diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/GeneratorRunnerConfig.cmake.in | 2 | ||||
| -rw-r--r-- | generatorrunnermacros.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b641f44ad..a5b60abe0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ if(MSVC) set(CMAKE_CXX_FLAGS "/Zc:wchar_t- /EHsc /DWIN32 /D_WINDOWS /D_SCL_SECURE_NO_WARNINGS") else() option(ENABLE_GCC_OPTIMIZATION "Enable specific GCC flags to optimize library size and performance. Only available on Release Mode" 0) - if (CMAKE_HOST_UNIX) + if (CMAKE_HOST_UNIX AND NOT CYGWIN) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fvisibility=hidden") endif() set(CMAKE_CXX_FLAGS_DEBUG "-g") diff --git a/data/GeneratorRunnerConfig.cmake.in b/data/GeneratorRunnerConfig.cmake.in index f8bc898bc..cf973e2a6 100644 --- a/data/GeneratorRunnerConfig.cmake.in +++ b/data/GeneratorRunnerConfig.cmake.in @@ -6,6 +6,8 @@ SET(GENERATORRUNNER_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/generatorrunner@generator_SUFFIX@") if(MSVC) SET(GENERATORRUNNER_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@genrunner@generator_SUFFIX@.lib") +elseif(CYGWIN) + SET(GENERATORRUNNER_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_IMPORT_LIBRARY_PREFIX@genrunner@generator_SUFFIX@@CMAKE_IMPORT_LIBRARY_SUFFIX@") elseif(WIN32) SET(GENERATORRUNNER_LIBRARY "@CMAKE_INSTALL_PREFIX@/bin/@CMAKE_SHARED_LIBRARY_PREFIX@genrunner@generator_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@") else() diff --git a/generatorrunnermacros.h b/generatorrunnermacros.h index abce21de6..9dfdca3d5 100644 --- a/generatorrunnermacros.h +++ b/generatorrunnermacros.h @@ -25,7 +25,7 @@ #define GENERATORRUNNERMACROS_H // GENRUNNER_API is used for the public API symbols. -#if defined _WIN32 || defined __CYGWIN__ +#if defined _WIN32 #define GENRUNNER_EXPORT __declspec(dllexport) #if GENRUNNER_EXPORTS #define GENRUNNER_API GENRUNNER_EXPORT |