summaryrefslogtreecommitdiffstats
path: root/SetFlags.cmake
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-06-27 12:15:24 +0200
committermadmaxoft <github@xoft.cz>2014-06-27 12:15:24 +0200
commit9c29afb300200b661e35e3de3b6f26900f43517c (patch)
treeb785f0a145048d484a15c26100b47a4a5828035a /SetFlags.cmake
parentMerged branch 'howaner/Bow'. (diff)
downloadcuberite-9c29afb300200b661e35e3de3b6f26900f43517c.tar
cuberite-9c29afb300200b661e35e3de3b6f26900f43517c.tar.gz
cuberite-9c29afb300200b661e35e3de3b6f26900f43517c.tar.bz2
cuberite-9c29afb300200b661e35e3de3b6f26900f43517c.tar.lz
cuberite-9c29afb300200b661e35e3de3b6f26900f43517c.tar.xz
cuberite-9c29afb300200b661e35e3de3b6f26900f43517c.tar.zst
cuberite-9c29afb300200b661e35e3de3b6f26900f43517c.zip
Diffstat (limited to '')
-rw-r--r--SetFlags.cmake12
1 files changed, 8 insertions, 4 deletions
diff --git a/SetFlags.cmake b/SetFlags.cmake
index 6e2417a51..290804fb6 100644
--- a/SetFlags.cmake
+++ b/SetFlags.cmake
@@ -63,12 +63,16 @@ macro(set_flags)
else()
# Let gcc / clang know that we're compiling a multi-threaded app:
- add_flags_cxx("-pthread")
+ if (UNIX)
+ add_flags_cxx("-pthread")
+ endif()
+
+ # Make CLang use C++11, otherwise MSVC2008-supported extensions don't work ("override" keyword etc.):
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11")
set(CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_COVERAGE} -std=c++11")
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11")
endif()
# We use a signed char (fixes #640 on RasPi)