# HG changeset patch # User Sebastien Jodogne # Date 1393255636 -3600 # Node ID 37aec47f49f0ed59c6713ab1ae36f77214bb5407 # Parent 5b63440f516412adbce9b43d5322de39aa722377 successful compilation under Mac OS X Mavericks diff -r 5b63440f5164 -r 37aec47f49f0 Resources/CMake/BoostConfiguration.cmake --- a/Resources/CMake/BoostConfiguration.cmake Mon Feb 24 16:18:35 2014 +0100 +++ b/Resources/CMake/BoostConfiguration.cmake Mon Feb 24 16:27:16 2014 +0100 @@ -54,7 +54,8 @@ set(BOOST_SOURCES) - if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR + ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") list(APPEND BOOST_SOURCES ${BOOST_SOURCES_DIR}/libs/thread/src/pthread/once.cpp ${BOOST_SOURCES_DIR}/libs/thread/src/pthread/thread.cpp @@ -78,17 +79,14 @@ -DBOOST_LOCALE_WITH_WCONV=1 ) - elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + else() + message(FATAL_ERROR "Support your platform here") + endif() + + if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") list(APPEND BOOST_SOURCES - ${BOOST_SOURCES_DIR}/libs/thread/src/pthread/once.cpp - ${BOOST_SOURCES_DIR}/libs/thread/src/pthread/thread.cpp ${BOOST_SOURCES_DIR}/libs/filesystem/src/utf8_codecvt_facet.cpp ) - - aux_source_directory(${BOOST_SOURCES_DIR}/libs/locale/src/posix BOOST_SOURCES) - - else() - message(FATAL_ERROR "Support your platform here") endif() aux_source_directory(${BOOST_SOURCES_DIR}/libs/regex/src BOOST_REGEX_SOURCES) @@ -104,12 +102,6 @@ ${BOOST_SOURCES_DIR}/libs/system/src/error_code.cpp ) - if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - # list(REMOVE_ITEM BOOST_SOURCES - # ${BOOST_SOURCES_DIR}/libs/locale/src/encoding/codepage.cpp - # ) - endif() - list(APPEND THIRD_PARTY_SOURCES ${BOOST_SOURCES}) add_definitions( diff -r 5b63440f5164 -r 37aec47f49f0 Resources/CMake/Compiler.cmake --- a/Resources/CMake/Compiler.cmake Mon Feb 24 16:18:35 2014 +0100 +++ b/Resources/CMake/Compiler.cmake Mon Feb 24 16:27:16 2014 +0100 @@ -73,6 +73,7 @@ add_definitions( -D_XOPEN_SOURCE=1 ) + link_libraries(iconv) endif()