Mercurial > hg > orthanc
comparison Resources/CMake/BoostConfiguration.cmake @ 552:938d8461cf8f
revert to boost 1.54.0, use ZIP instead of TGZ because of bad directory in package
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 17 Sep 2013 14:20:48 +0200 |
parents | 2699ccdcce20 |
children | 27d32fc6209a |
comparison
equal
deleted
inserted
replaced
551:2699ccdcce20 | 552:938d8461cf8f |
---|---|
37 link_libraries(${Boost_LIBRARIES}) | 37 link_libraries(${Boost_LIBRARIES}) |
38 endif() | 38 endif() |
39 | 39 |
40 | 40 |
41 if (BOOST_STATIC) | 41 if (BOOST_STATIC) |
42 if (0) | 42 # Parameters for Boost 1.54.0 |
43 # Parameters for Boost 1.49.0 | 43 SET(BOOST_NAME boost_1_54_0) |
44 SET(BOOST_NAME boost_1_49_0) | 44 SET(BOOST_MD5 "78a35834c45220a6164310e280abe675") |
45 SET(BOOST_MD5 "e0defc8c818e4f1c5bbb29d0292b76ca") | 45 SET(BOOST_FILESYSTEM_SOURCES_DIR "${BOOST_NAME}/libs/filesystem/src") |
46 SET(BOOST_FILESYSTEM_SOURCES_DIR "${BOOST_NAME}/libs/filesystem/v3/src") | |
47 else() | |
48 # Parameters for Boost 1.53.0 | |
49 SET(BOOST_NAME boost_1_53_0) | |
50 SET(BOOST_MD5 "57a9e2047c0f511c4dfcf00eb5eb2fbb") | |
51 SET(BOOST_FILESYSTEM_SOURCES_DIR "${BOOST_NAME}/libs/filesystem/src") | |
52 endif() | |
53 | 46 |
54 SET(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME}) | 47 SET(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME}) |
55 DownloadPackage( | 48 DownloadPackage( |
56 "${BOOST_MD5}" | 49 "${BOOST_MD5}" |
57 "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/${BOOST_NAME}.tar.gz" | 50 "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/${BOOST_NAME}.zip" |
58 "${BOOST_SOURCES_DIR}" "${BOOST_PRELOADED}" | 51 "${BOOST_SOURCES_DIR}" "${BOOST_PRELOADED}" |
59 # Only uncompress the Boost modules we need | 52 # Only uncompress the Boost modules we need |
60 "${BOOST_NAME}/boost ${BOOST_NAME}/libs/thread/src ${BOOST_NAME}/libs/system/src ${BOOST_NAME}/libs/locale/src ${BOOST_NAME}/libs/date_time/src ${BOOST_FILESYSTEM_SOURCES_DIR}" | 53 "${BOOST_NAME}/boost/* ${BOOST_NAME}/libs/thread/src/* ${BOOST_NAME}/libs/system/src/* ${BOOST_NAME}/libs/locale/src/* ${BOOST_NAME}/libs/date_time/src/* ${BOOST_FILESYSTEM_SOURCES_DIR}/*" |
61 ) | 54 ) |
62 | 55 |
63 set(BOOST_SOURCES) | 56 set(BOOST_SOURCES) |
64 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") | 57 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") |
65 list(APPEND BOOST_SOURCES | 58 list(APPEND BOOST_SOURCES |