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
1ed8ff6b
Commit
1ed8ff6b
authored
Jul 17, 2014
by
Matthias Vallentin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correctly set -stdlib=libc++ for Clang.
This is an addendum to
668a9962
.
parent
668a9962
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
13 deletions
+13
-13
CMakeLists.txt
CMakeLists.txt
+13
-13
No files found.
CMakeLists.txt
View file @
1ed8ff6b
...
@@ -52,12 +52,6 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
...
@@ -52,12 +52,6 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
else
()
else
()
message
(
FATAL_ERROR
"clang++ >= 3.2 required (found:
${
CompilerVersion
}
."
)
message
(
FATAL_ERROR
"clang++ >= 3.2 required (found:
${
CompilerVersion
}
."
)
endif
()
endif
()
if
(
NOT CXXFLAGS_PROVIDED
)
message
(
STATUS
"NOTE: Automatically added -stdlib=libc++ flag, "
"you can override this by defining CMAKE_CXX_FLAGS "
"(see 'configure --help')"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-stdlib=libc++"
)
endif
()
else
()
else
()
message
(
FATAL_ERROR
"Your C++ compiler does not support C++11 "
message
(
FATAL_ERROR
"Your C++ compiler does not support C++11 "
"or is not supported"
)
"or is not supported"
)
...
@@ -70,10 +64,16 @@ if (CMAKE_CXX_FLAGS)
...
@@ -70,10 +64,16 @@ if (CMAKE_CXX_FLAGS)
set
(
CMAKE_CXX_FLAGS_MINSIZEREL
""
)
set
(
CMAKE_CXX_FLAGS_MINSIZEREL
""
)
set
(
CMAKE_CXX_FLAGS_RELEASE
""
)
set
(
CMAKE_CXX_FLAGS_RELEASE
""
)
set
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
""
)
set
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
""
)
else
(
CMAKE_CXX_FLAGS
)
else
()
set
(
CXXFLAGS_PROVIDED false
)
set
(
CXXFLAGS_PROVIDED false
)
if
(
MORE_CLANG_WARNINGS AND
"
${
CMAKE_CXX_COMPILER_ID
}
"
MATCHES
"Clang"
)
if
(
"
${
CMAKE_CXX_COMPILER_ID
}
"
MATCHES
"Clang"
)
set
(
CMAKE_CXX_FLAGS
"-std=c++11 -pedantic -Weverything -Wno-c++98-compat -Wno-padded -Wno-documentation-unknown-command -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-c++98-compat-pedantic -Wno-unused-member-function -Wno-unused-const-variable"
)
message
(
STATUS
"NOTE: Automatically added -stdlib=libc++ flag, "
"you can override this by defining CMAKE_CXX_FLAGS "
"(see 'configure --help')"
)
set
(
CMAKE_CXX_FLAGS
"-std=c++11 -stdlib=libc++"
)
if
(
MORE_CLANG_WARNINGS
)
set
(
CMAKE_CXX_FLAGS
"-pedantic -Weverything -Wno-c++98-compat -Wno-padded -Wno-documentation-unknown-command -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-c++98-compat-pedantic -Wno-unused-member-function -Wno-unused-const-variable"
)
endif
()
else
()
else
()
set
(
CMAKE_CXX_FLAGS
"-std=c++11 -Wextra -Wall -pedantic"
)
set
(
CMAKE_CXX_FLAGS
"-std=c++11 -Wextra -Wall -pedantic"
)
endif
()
endif
()
...
@@ -85,7 +85,7 @@ else (CMAKE_CXX_FLAGS)
...
@@ -85,7 +85,7 @@ else (CMAKE_CXX_FLAGS)
set
(
CMAKE_CXX_FLAGS_MINSIZEREL
"-Os"
)
set
(
CMAKE_CXX_FLAGS_MINSIZEREL
"-Os"
)
set
(
CMAKE_CXX_FLAGS_RELEASE
"-O3 -DNDEBUG"
)
set
(
CMAKE_CXX_FLAGS_RELEASE
"-O3 -DNDEBUG"
)
set
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-O2 -g"
)
set
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-O2 -g"
)
endif
(
CMAKE_CXX_FLAGS
)
endif
()
include
(
CheckIncludeFileCXX
)
include
(
CheckIncludeFileCXX
)
check_include_file_cxx
(
"valgrind/valgrind.h"
HAVE_VALGRIND_H
)
check_include_file_cxx
(
"valgrind/valgrind.h"
HAVE_VALGRIND_H
)
...
@@ -169,8 +169,8 @@ set (LIBCAF_SRCS
...
@@ -169,8 +169,8 @@ set (LIBCAF_SRCS
src/local_actor.cpp
src/local_actor.cpp
src/logging.cpp
src/logging.cpp
src/mailbox_element.cpp
src/mailbox_element.cpp
src/max_msg_size.cpp
src/match.cpp
src/match.cpp
src/max_msg_size.cpp
src/memory.cpp
src/memory.cpp
src/memory_managed.cpp
src/memory_managed.cpp
src/message.cpp
src/message.cpp
...
@@ -180,21 +180,21 @@ set (LIBCAF_SRCS
...
@@ -180,21 +180,21 @@ set (LIBCAF_SRCS
src/middleman.cpp
src/middleman.cpp
src/network.cpp
src/network.cpp
src/node_id.cpp
src/node_id.cpp
src/publish_local_groups.cpp
src/ref_counted.cpp
src/ref_counted.cpp
src/remote_actor_proxy.cpp
src/remote_actor_proxy.cpp
src/response_promise.cpp
src/response_promise.cpp
src/resumable.cpp
src/resumable.cpp
src/ripemd_160.cpp
src/ripemd_160.cpp
src/scheduler.cpp
src/scheduler.cpp
src/shutdown.cpp
src/scoped_actor.cpp
src/scoped_actor.cpp
src/serializer.cpp
src/serializer.cpp
src/shared_spinlock.cpp
src/shared_spinlock.cpp
src/shutdown.cpp
src/singletons.cpp
src/singletons.cpp
src/string_algorithms.cpp
src/string_algorithms.cpp
src/string_serialization.cpp
src/string_serialization.cpp
src/sync_request_bouncer.cpp
src/sync_request_bouncer.cpp
src/publish_local_groups.cpp
src/to_uniform_name.cpp
src/to_uniform_name.cpp
src/uniform_type_info.cpp
src/uniform_type_info.cpp
src/uniform_type_info_map.cpp
)
src/uniform_type_info_map.cpp
)
...
...
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