Mercurial > hg > orthanc
comparison Resources/CMake/GoogleLogConfiguration.cmake @ 495:5bb96a6100c0
fixes for mingw64
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 19 Jul 2013 16:11:13 +0200 |
parents | 5f6d75cd4b46 |
children | 27d32fc6209a |
comparison
equal
deleted
inserted
replaced
494:012b63028085 | 495:5bb96a6100c0 |
---|---|
2 SET(GOOGLE_LOG_SOURCES_DIR ${CMAKE_BINARY_DIR}/glog-0.3.2) | 2 SET(GOOGLE_LOG_SOURCES_DIR ${CMAKE_BINARY_DIR}/glog-0.3.2) |
3 DownloadPackage( | 3 DownloadPackage( |
4 "897fbff90d91ea2b6d6e78c8cea641cc" | 4 "897fbff90d91ea2b6d6e78c8cea641cc" |
5 "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/glog-0.3.2.tar.gz" | 5 "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/glog-0.3.2.tar.gz" |
6 "${GOOGLE_LOG_SOURCES_DIR}" "" "") | 6 "${GOOGLE_LOG_SOURCES_DIR}" "" "") |
7 | |
8 #SET(GOOGLE_LOG_SOURCES_DIR ${CMAKE_BINARY_DIR}/glog-0.3.3) | |
9 #DownloadPackage( | |
10 # "a6fd2c22f8996846e34c763422717c18" | |
11 # "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/glog-0.3.3.tar.gz" | |
12 # "${GOOGLE_LOG_SOURCES_DIR}" "" "") | |
7 | 13 |
8 set(GOOGLE_LOG_HEADERS | 14 set(GOOGLE_LOG_HEADERS |
9 ${GOOGLE_LOG_SOURCES_DIR}/src/glog/logging.h | 15 ${GOOGLE_LOG_SOURCES_DIR}/src/glog/logging.h |
10 ${GOOGLE_LOG_SOURCES_DIR}/src/glog/raw_logging.h | 16 ${GOOGLE_LOG_SOURCES_DIR}/src/glog/raw_logging.h |
11 ${GOOGLE_LOG_SOURCES_DIR}/src/glog/stl_logging.h | 17 ${GOOGLE_LOG_SOURCES_DIR}/src/glog/stl_logging.h |
95 add_definitions( | 101 add_definitions( |
96 -DGLOG_NO_ABBREVIATED_SEVERITIES=1 | 102 -DGLOG_NO_ABBREVIATED_SEVERITIES=1 |
97 -DNO_FRAME_POINTER=1 | 103 -DNO_FRAME_POINTER=1 |
98 -DGOOGLE_GLOG_DLL_DECL= | 104 -DGOOGLE_GLOG_DLL_DECL= |
99 ) | 105 ) |
106 | |
107 if (${CMAKE_COMPILER_IS_GNUCXX}) | |
108 # This is a patch for MinGW64 | |
109 add_definitions(-D_TIME_H__S=1) | |
110 endif() | |
111 | |
100 endif() | 112 endif() |
101 | 113 |
114 | |
115 | |
102 add_library(GoogleLog STATIC ${GOOGLE_LOG_SOURCES}) | 116 add_library(GoogleLog STATIC ${GOOGLE_LOG_SOURCES}) |
103 link_libraries(GoogleLog) | 117 link_libraries(GoogleLog) |
104 | 118 |
105 else() | 119 else() |
106 CHECK_INCLUDE_FILE_CXX(glog/logging.h HAVE_GOOGLE_LOG_H) | 120 CHECK_INCLUDE_FILE_CXX(glog/logging.h HAVE_GOOGLE_LOG_H) |