Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
e833d791
Commit
e833d791
authored
Jul 09, 2012
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into unstable
parents
4ff094b6
3ee22730
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
5 deletions
+15
-5
CMakeLists.txt
CMakeLists.txt
+12
-4
examples/CMakeLists.txt
examples/CMakeLists.txt
+3
-1
No files found.
CMakeLists.txt
View file @
e833d791
...
@@ -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
)
if
(
CMAKE_SIZEOF_VOID_P EQUAL 4
)
set_property
(
SOURCE
${
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
set_property
(
SOURCE
${
boost_context
}
/src/asm/fcontext_x86_64_sysv_macho_gas.S
${
boost_context
}
/src/asm/fcontext_x86_64_sysv_macho_gas.S
PROPERTY LANGUAGE CXX
)
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
)
...
...
examples/CMakeLists.txt
View file @
e833d791
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
}
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment