Mercurial > hg > orthanc

changeset 18:f3551378e8f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes for mingw
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 24 Jul 2012 10:03:17 +0200
parents db4d996ea264
children e85455ff6039
files NEWS Resources/CMake/BoostConfiguration.cmake
diffstat 2 files changed, 15 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Mon Jul 23 09:29:00 2012 +0200
+++ b/NEWS	Tue Jul 24 10:03:17 2012 +0200
@@ -1,3 +1,8 @@
+Pending changes
+===============
+
+* Licensing of the "Core/SQLite" folder
+
 
 Version 0.1.1 (2012/07/20)
 ==========================
--- a/Resources/CMake/BoostConfiguration.cmake	Mon Jul 23 09:29:00 2012 +0200
+++ b/Resources/CMake/BoostConfiguration.cmake	Tue Jul 24 10:03:17 2012 +0200
@@ -26,8 +26,9 @@
   SET(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME})
   DownloadPackage("http://switch.dl.sourceforge.net/project/boost/boost/1.49.0/${BOOST_NAME}.tar.gz" "${BOOST_SOURCES_DIR}" "${BOOST_PRELOADED}" "${BOOST_NAME}/boost ${BOOST_NAME}/libs/thread/src ${BOOST_NAME}/libs/system/src ${BOOST_NAME}/libs/filesystem/v3/src ${BOOST_NAME}/libs/locale/src")
 
+  set(BOOST_SOURCES)
   if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-    list(APPEND THIRD_PARTY_SOURCES 
+    list(APPEND BOOST_SOURCES
       ${BOOST_SOURCES_DIR}/libs/thread/src/pthread/once.cpp
       ${BOOST_SOURCES_DIR}/libs/thread/src/pthread/thread.cpp
       )
@@ -35,7 +36,7 @@
       -DBOOST_LOCALE_WITH_ICONV=1
       )
   elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-    list(APPEND THIRD_PARTY_SOURCES 
+    list(APPEND BOOST_SOURCES
       ${BOOST_SOURCES_DIR}/libs/thread/src/win32/tss_dll.cpp
       ${BOOST_SOURCES_DIR}/libs/thread/src/win32/thread.cpp
       ${BOOST_SOURCES_DIR}/libs/thread/src/win32/tss_pe.cpp
@@ -48,7 +49,7 @@
     message(FATAL_ERROR "Support your platform here")
   endif()
 
-  list(APPEND THIRD_PARTY_SOURCES 
+  list(APPEND BOOST_SOURCES
     ${BOOST_SOURCES_DIR}/libs/system/src/error_code.cpp
     ${BOOST_SOURCES_DIR}/libs/filesystem/v3/src/path.cpp
     ${BOOST_SOURCES_DIR}/libs/filesystem/v3/src/path_traits.cpp
@@ -57,6 +58,8 @@
     ${BOOST_SOURCES_DIR}/libs/locale/src/encoding/codepage.cpp
     )
 
+  list(APPEND THIRD_PARTY_SOURCES ${BOOST_SOURCES})
+
   add_definitions(
     # Static build of Boost
     -DBOOST_ALL_NO_LIB 
@@ -69,6 +72,10 @@
     -DBOOST_LOCALE_NO_LIB
     )
 
+  if (${CMAKE_COMPILER_IS_GNUCXX})
+    add_definitions(-isystem ${BOOST_SOURCES_DIR})
+  endif()
+
   include_directories(
     ${BOOST_SOURCES_DIR}
     )