From 93001f6a1fe8fa1fe7bf4d7d5dcda7fefae888b8 Mon Sep 17 00:00:00 2001 From: Yaakov Date: Thu, 27 Oct 2011 11:17:44 -0200 Subject: Fix bug 1008 - "ApiExtractor Cygwin patch" Reviewer: Hugo Parente Lima Marcelo Lira --- CMakeLists.txt | 4 +++- apiextractormacros.h | 2 +- data/ApiExtractorConfig.cmake.in | 2 ++ parser/rpp/preprocessor.cpp | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 62065e8..ca33270 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,9 @@ if(MSVC) set(CMAKE_CXX_FLAGS "/Zc:wchar_t- /GR /EHsc /DWIN32 /D_WINDOWS /D_SCL_SECURE_NO_WARNINGS") elseif(CMAKE_HOST_UNIX) option(ENABLE_GCC_OPTIMIZATION "Enable specific GCC flags to optimize library size and performance. Only available on Release Mode" 0) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fvisibility=hidden") + if(NOT CYGWIN) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fvisibility=hidden") + endif() set(CMAKE_CXX_FLAGS_DEBUG "-g") if(ENABLE_GCC_OPTIMIZATION) set(CMAKE_BUILD_TYPE Release) diff --git a/apiextractormacros.h b/apiextractormacros.h index 1c493c2..6430c4f 100644 --- a/apiextractormacros.h +++ b/apiextractormacros.h @@ -3,7 +3,7 @@ // APIEXTRACTOR_API is used for the public API symbols. -#if defined _WIN32 || defined __CYGWIN__ +#if defined _WIN32 #if APIEXTRACTOR_EXPORTS #define APIEXTRACTOR_API __declspec(dllexport) #else diff --git a/data/ApiExtractorConfig.cmake.in b/data/ApiExtractorConfig.cmake.in index 3866829..6e6f419 100644 --- a/data/ApiExtractorConfig.cmake.in +++ b/data/ApiExtractorConfig.cmake.in @@ -5,6 +5,8 @@ SET(APIEXTRACTOR_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/apiextractor@apiextractor_SUFFIX@") if(MSVC) SET(APIEXTRACTOR_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@apiextractor@apiextractor_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@.lib") +elseif(CYGWIN) + SET(APIEXTRACTOR_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_IMPORT_LIBRARY_PREFIX@apiextractor@apiextractor_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_IMPORT_LIBRARY_SUFFIX@") elseif(WIN32) SET(APIEXTRACTOR_LIBRARY "@CMAKE_INSTALL_PREFIX@/bin/@CMAKE_SHARED_LIBRARY_PREFIX@apiextractor@apiextractor_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@") else() diff --git a/parser/rpp/preprocessor.cpp b/parser/rpp/preprocessor.cpp index be6a851..9a4f8b0 100644 --- a/parser/rpp/preprocessor.cpp +++ b/parser/rpp/preprocessor.cpp @@ -25,6 +25,7 @@ #include "preprocessor.h" #include +#include // register callback for include hooks static void includeFileHook(const std::string &, const std::string &, FILE *); -- cgit v1.2.3