Commit 53ad46d8 authored by Bastien Jacquet's avatar Bastien Jacquet
Browse files

OSX package fixes

Multiple bugfixes to get cpack to work on 10.10
It should work on 10.12 too, but 10.13 is known not to work (because of Qt4 at least)

See internal merge request 140
parents a1212b83 0de0d0f8
......@@ -34,8 +34,10 @@ if (APPLE)
mark_as_advanced(APPLY_MOUNTAIN_LION_FIX)
# Fix stdlic being wrongly used instead of libc++
# (as it conflicts with boost which always uses libc++)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
# REMOVED as this prevents qt to build its bootstrap target compatible with 10.4
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
# set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
elseif (UNIX)
set (platform "unix")
elseif (WIN32)
......
set (boost_toolset "")
set (boost_osx_opts "")
if (APPLE)
set (boost_toolset "--with-toolset=clang")
set (boost_osx_opts "toolset=clang cxxflags=\"-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}\" cflags=\"-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}\"")
message(STATUS "${boost_osx_opts}")
#macosx-version=${CMAKE_OSX_DEPLOYMENT_TARGET} macosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
endif(APPLE)
add_external_project_or_use_system(boost
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND
<SOURCE_DIR>/bootstrap.sh --prefix=<INSTALL_DIR>
<SOURCE_DIR>/bootstrap.sh ${boost_toolset} --prefix=<INSTALL_DIR>
--with-libraries=date_time,thread,regex,system,program_options,filesystem,iostreams,chrono
BUILD_COMMAND <SOURCE_DIR>/bjam address-model=${VV_BUILD_ARCHITECTURE} threading=multi
INSTALL_COMMAND <SOURCE_DIR>/bjam address-model=${VV_BUILD_ARCHITECTURE} threading=multi --prefix=<INSTALL_DIR> install
BUILD_COMMAND <SOURCE_DIR>/bjam address-model=${VV_BUILD_ARCHITECTURE} threading=multi --with-regex --with-system --with-date_time --with-program_options --with-iostreams --with-filesystem --with-thread ${boost_osx_opts} --prefix=<INSTALL_DIR> install
INSTALL_COMMAND ""
)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment