From 6fca000233229cf3bb23427ad56e0ff6a4dca3e4 Mon Sep 17 00:00:00 2001 From: PBerger Date: Mon, 23 Sep 2013 16:48:42 +0200 Subject: [PATCH] Removed defines.hxx from source tree Added a new include path for storm as to include the generated out-of-source defines.hxx Former-commit-id: 1a75f61da06547afd0883c6fdfd361dc4ce38dda --- CMakeLists.txt | 1 + .../include/log4cplus/config/defines.hxx | 256 ------------------ 2 files changed, 1 insertion(+), 256 deletions(-) delete mode 100644 resources/3rdparty/log4cplus-1.1.2-rc2/include/log4cplus/config/defines.hxx diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a9dd922c..bf95171fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -297,6 +297,7 @@ set(LOG4CPLUS_BUILD_TESTING NO) set(LOG4CPLUS_USE_UNICODE OFF) add_subdirectory("${PROJECT_SOURCE_DIR}/resources/3rdparty/log4cplus-1.1.2-rc2") include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/log4cplus-1.1.2-rc2/include") +include_directories("${PROJECT_BINARY_DIR}/resources/3rdparty/log4cplus-1.1.2-rc2/include") # This adds the defines.hxx file target_link_libraries(storm log4cplusS) target_link_libraries(storm-functional-tests log4cplusS) target_link_libraries(storm-performance-tests log4cplusS) diff --git a/resources/3rdparty/log4cplus-1.1.2-rc2/include/log4cplus/config/defines.hxx b/resources/3rdparty/log4cplus-1.1.2-rc2/include/log4cplus/config/defines.hxx deleted file mode 100644 index 4d802f55e..000000000 --- a/resources/3rdparty/log4cplus-1.1.2-rc2/include/log4cplus/config/defines.hxx +++ /dev/null @@ -1,256 +0,0 @@ -#ifndef LOG4CPLUS_CONFIG_DEFINES_HXX -#define LOG4CPLUS_CONFIG_DEFINES_HXX - -/* */ -#define LOG4CPLUS_HAVE_SYSLOG_H 1 - -/* */ -#define LOG4CPLUS_HAVE_ARPA_INET_H 1 - -/* */ -#define LOG4CPLUS_HAVE_NETINET_IN_H 1 - -/* */ -#define LOG4CPLUS_HAVE_NETINET_TCP_H 1 - -/* */ -#define LOG4CPLUS_HAVE_SYS_TIMEB_H 1 - -/* */ -#define LOG4CPLUS_HAVE_SYS_TIME_H 1 - -/* */ -#define LOG4CPLUS_HAVE_SYS_TYPES_H 1 - -/* */ -#define LOG4CPLUS_HAVE_SYS_STAT_H 1 - -/* */ -#define LOG4CPLUS_HAVE_SYS_SYSCALL_H 1 - -/* */ -#define LOG4CPLUS_HAVE_SYS_FILE_H 1 - -/* */ -#define LOG4CPLUS_HAVE_TIME_H 1 - -/* */ -#define LOG4CPLUS_HAVE_SYS_SOCKET_H 1 - -/* */ -#define LOG4CPLUS_HAVE_NETDB_H 1 - -/* */ -#define LOG4CPLUS_HAVE_UNISTD_H 1 - -/* */ -#define LOG4CPLUS_HAVE_FCNTL_H 1 - -/* */ -#define LOG4CPLUS_HAVE_STDARG_H 1 - -/* */ -#define LOG4CPLUS_HAVE_STDIO_H 1 - -/* */ -#define LOG4CPLUS_HAVE_STDLIB_H 1 - -/* */ -#define LOG4CPLUS_HAVE_ERRNO_H 1 - -/* */ -#define LOG4CPLUS_HAVE_WCHAR_H 1 - -/* */ -#define LOG4CPLUS_HAVE_ICONV_H 1 - -/* */ -#define LOG4CPLUS_HAVE_LIMITS_H 1 - -/* */ -#define LOG4CPLUS_HAVE_FTIME 1 - -/* */ -#define LOG4CPLUS_HAVE_GETADDRINFO 1 - -/* */ -/* #undef LOG4CPLUS_HAVE_GETHOSTBYNAME_R */ - -/* */ -#define LOG4CPLUS_HAVE_GETPID 1 - -/* */ -#define LOG4CPLUS_HAVE_GETTIMEOFDAY 1 - -/* Define to 1 if you have the `clock_gettime' function. */ -/* #undef LOG4CPLUS_HAVE_CLOCK_GETTIME */ - -/* Define to 1 if you have the `nanosleep' function. */ -#define LOG4CPLUS_HAVE_NANOSLEEP 1 - -/* Define to 1 if you have the `clock_nanosleep' function. */ -/* #undef LOG4CPLUS_HAVE_CLOCK_NANOSLEEP */ - -/* */ -#define LOG4CPLUS_HAVE_GMTIME_R 1 - -/* */ -#define LOG4CPLUS_HAVE_HTONL 1 - -/* */ -#define LOG4CPLUS_HAVE_HTONS 1 - -/* */ -#define LOG4CPLUS_HAVE_LOCALTIME_R 1 - -/* */ -#define LOG4CPLUS_HAVE_LSTAT 1 - -/* */ -#define LOG4CPLUS_HAVE_FCNTL 1 - -/* */ -#define LOG4CPLUS_HAVE_LOCKF 1 - -/* */ -#define LOG4CPLUS_HAVE_FLOCK 1 - -/* */ -#define LOG4CPLUS_HAVE_NTOHL 1 - -/* */ -#define LOG4CPLUS_HAVE_NTOHS 1 - -/* */ -#define LOG4CPLUS_HAVE_PIPE 1 - -/* */ -/* #undef LOG4CPLUS_HAVE_PIPE2 */ - -/* */ -#define LOG4CPLUS_HAVE_POLL 1 - -/* */ -#define LOG4CPLUS_HAVE_POLL_H 1 - -/* */ -#define LOG4CPLUS_HAVE_STAT 1 - -/* Define if this is a single-threaded library. */ -/* #undef LOG4CPLUS_SINGLE_THREADED */ - -/* */ -/* #undef LOG4CPLUS_USE_PTHREADS */ - -/* Define for compilers/standard libraries that support more than just the "C" - locale. */ -/* #undef LOG4CPLUS_WORKING_LOCALE */ - -/* Define for C99 compilers/standard libraries that support more than just the - "C" locale. */ -/* #undef LOG4CPLUS_WORKING_C_LOCALE */ - -/* Define to int if undefined. */ -/* #undef socklen_t */ - -/* Defined for --enable-debugging builds. */ -/* #undef LOG4CPLUS_DEBUGGING */ - -/* Defined if the compiler understands __declspec(dllexport) or - __attribute__((visibility("default"))) construct. */ -#define LOG4CPLUS_DECLSPEC_EXPORT __attribute__ ((visibility("default"))) - -/* Defined if the compiler understands __declspec(dllimport) or - __attribute__((visibility("default"))) construct. */ -#define LOG4CPLUS_DECLSPEC_IMPORT __attribute__ ((visibility("default"))) - -/* Defined if the compiler understands - __attribute__((visibility("hidden"))) construct. */ -#define LOG4CPLUS_DECLSPEC_PRIVATE __attribute__ ((visibility("hidden"))) - -/* */ -#define LOG4CPLUS_HAVE_TLS_SUPPORT 1 - -/* */ -#define LOG4CPLUS_THREAD_LOCAL_VAR __thread - -/* Defined if the host OS provides ENAMETOOLONG errno value. */ -#define LOG4CPLUS_HAVE_ENAMETOOLONG 1 - -/* Defined if the compiler provides __sync_add_and_fetch(). */ -#define LOG4CPLUS_HAVE___SYNC_ADD_AND_FETCH 1 - -/* Defined if the compiler provides __sync_sub_and_fetch(). */ -#define LOG4CPLUS_HAVE___SYNC_SUB_AND_FETCH 1 - -/* Defined if the compiler provides C++11 header and increment, - decrement operations. */ -#define LOG4CPLUS_HAVE_CXX11_ATOMICS 1 - -/* */ -#define LOG4CPLUS_HAVE_C99_VARIADIC_MACROS 1 - -/* */ -#define LOG4CPLUS_HAVE_GNU_VARIADIC_MACROS 1 - -/* */ -#define LOG4CPLUS_HAVE_VSNPRINTF 1 - -/* Define to 1 if you have the `vsnwprintf' function. */ -/* #undef LOG4CPLUS_HAVE_VSNWPRINTF */ - -/* Define to 1 if you have the `_vsnwprintf' function. */ -/* #undef LOG4CPLUS_HAVE__VSNWPRINTF */ - -/* */ -/* #undef LOG4CPLUS_HAVE__VSNPRINTF */ - -/* Define to 1 if you have the `vfprintf_s' function. */ -/* #undef LOG4CPLUS_HAVE_VFPRINTF_S */ - -/* Define to 1 if you have the `vfwprintf_s' function. */ -/* #undef LOG4CPLUS_HAVE_VFWPRINTF_S */ - -/* Define to 1 if you have the `vsprintf_s' function. */ -/* #undef LOG4CPLUS_HAVE_VSPRINTF_S */ - -/* Define to 1 if you have the `vswprintf_s' function. */ -/* #undef LOG4CPLUS_HAVE_VSWPRINTF_S */ - -/* Define to 1 if you have the `_vsnprintf_s' function. */ -/* #undef LOG4CPLUS_HAVE__VSNPRINTF_S */ - -/* Define to 1 if you have the `_vsnwprintf_s' function. */ -/* #undef LOG4CPLUS_HAVE__VSNWPRINTF_S */ - -/* Defined if the compiler supports __FUNCTION__ macro. */ -#define LOG4CPLUS_HAVE_FUNCTION_MACRO 1 - -/* Defined if the compiler supports __PRETTY_FUNCTION__ macro. */ -#define LOG4CPLUS_HAVE_PRETTY_FUNCTION_MACRO 1 - -/* Defined if the compiler supports __func__ symbol. */ -#define LOG4CPLUS_HAVE_FUNC_SYMBOL 1 - -/* Define to 1 if you have the `mbstowcs' function. */ -#define LOG4CPLUS_HAVE_MBSTOWCS 1 - -/* Define to 1 if you have the `wcstombs' function. */ -#define LOG4CPLUS_HAVE_WCSTOMBS 1 - -/* Define to 1 if you have Linux style syscall(SYS_gettid). */ -#define LOG4CPLUS_HAVE_GETTID 1 - -/* Define when iconv() is available. */ -/* #undef LOG4CPLUS_WITH_ICONV */ - -/* Define to 1 if you have the `iconv' function. */ -/* #undef LOG4CPLUS_HAVE_ICONV */ - -/* Define to 1 if you have the `iconv_close' function. */ -/* #undef LOG4CPLUS_HAVE_ICONV_CLOSE */ - -/* Define to 1 if you have the `iconv_open' function. */ -/* #undef LOG4CPLUS_HAVE_ICONV_OPEN */ - -#endif // LOG4CPLUS_CONFIG_DEFINES_HXX