Commit e833d791 authored by Dominik Charousset's avatar Dominik Charousset

Merge branch 'master' into unstable

parents 4ff094b6 3ee22730
...@@ -93,15 +93,23 @@ set(boost_context third_party/boost_context/) ...@@ -93,15 +93,23 @@ set(boost_context third_party/boost_context/)
# add third_party boost_context sources # add third_party boost_context sources
if(APPLE) if(APPLE)
set_property(SOURCE if(CMAKE_SIZEOF_VOID_P EQUAL 4)
${boost_context}/src/asm/fcontext_x86_64_sysv_macho_gas.S set_property(SOURCE
PROPERTY LANGUAGE CXX) ${boost_context}/src/asm/fcontext_i386_sysv_macho_gas.S
PROPERTY LANGUAGE CXX)
set(fcontext_asm ${boost_context}/src/asm/fcontext_i386_sysv_macho_gas.S)
else()
set_property(SOURCE
${boost_context}/src/asm/fcontext_x86_64_sysv_macho_gas.S
PROPERTY LANGUAGE CXX)
set(fcontext_asm ${boost_context}/src/asm/fcontext_x86_64_sysv_macho_gas.S)
endif()
set(LIBCPPA_SRC set(LIBCPPA_SRC
${LIBCPPA_SRC} ${LIBCPPA_SRC}
${boost_context}/src/stack_utils_posix.cpp ${boost_context}/src/stack_utils_posix.cpp
${boost_context}/src/stack_allocator_posix.cpp ${boost_context}/src/stack_allocator_posix.cpp
${boost_context}/src/fcontext.cpp ${boost_context}/src/fcontext.cpp
${boost_context}/src/asm/fcontext_x86_64_sysv_macho_gas.S ${fcontext_asm}
) )
elseif(UNIX) elseif(UNIX)
if(CMAKE_SIZEOF_VOID_P EQUAL 4) if(CMAKE_SIZEOF_VOID_P EQUAL 4)
......
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
project(cppa_examples CXX) project(cppa_examples CXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wextra -Wall -pedantic")
# Set up environment paths to cmake modules and libcppa # Set up environment paths to cmake modules and libcppa
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
...@@ -22,7 +24,7 @@ endif (NOT cppa_LIBRARY) ...@@ -22,7 +24,7 @@ endif (NOT cppa_LIBRARY)
find_package(Boost COMPONENTS thread REQUIRED) find_package(Boost COMPONENTS thread REQUIRED)
link_directories(${Boost_LIBRARY_DIRS}) link_directories(${Boost_LIBRARY_DIRS})
include_directories(. ${cppa_INCLUDE} ${Boost_INCLUDE_DIRS}) include_directories(. ${CPPA_INCLUDE} ${Boost_INCLUDE_DIRS})
set(EXAMPLE_LIBS ${CMAKE_DL_LIBS} ${CPPA_LIBRARY} ${Boost_THREAD_LIBRARY}) set(EXAMPLE_LIBS ${CMAKE_DL_LIBS} ${CPPA_LIBRARY} ${Boost_THREAD_LIBRARY})
......
Markdown is supported
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