From 18c3b18a3fa1c2cfc14a321884744e5985383991 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Thu, 17 Apr 2014 13:02:20 +0100 Subject: Compile fix? --- SetFlags.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'SetFlags.cmake') diff --git a/SetFlags.cmake b/SetFlags.cmake index c5a3a0697..6c974ea94 100644 --- a/SetFlags.cmake +++ b/SetFlags.cmake @@ -46,6 +46,10 @@ macro(set_flags) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11") else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++0x") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++0x") + add_flags_cxx("-pthread") endif() @@ -56,6 +60,10 @@ macro(set_flags) 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_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11") + else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++0x") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++0x") endif() # We use a signed char (fixes #640 on RasPi) -- cgit v1.2.3 From 10cba6cf58d772a63da9d9fc1c3c3a7a33904b88 Mon Sep 17 00:00:00 2001 From: worktycho Date: Tue, 22 Apr 2014 13:05:23 +0100 Subject: Revert moving gcc to g++11 in 18c3b1 --- SetFlags.cmake | 8 -------- 1 file changed, 8 deletions(-) (limited to 'SetFlags.cmake') diff --git a/SetFlags.cmake b/SetFlags.cmake index 6c974ea94..c5a3a0697 100644 --- a/SetFlags.cmake +++ b/SetFlags.cmake @@ -46,10 +46,6 @@ macro(set_flags) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11") else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++0x") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++0x") - add_flags_cxx("-pthread") endif() @@ -60,10 +56,6 @@ macro(set_flags) 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_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11") - else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++0x") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++0x") endif() # We use a signed char (fixes #640 on RasPi) -- cgit v1.2.3 From ce505f6814fbed638bd638c46165cd8a09fb9872 Mon Sep 17 00:00:00 2001 From: archshift Date: Fri, 25 Apr 2014 07:58:59 -0700 Subject: Use libc++ on OSX Fixes issues with https://github.com/mc-server/MCServer/commit/f3dfc0349d7008efa50855c739d86918bdbf4a88 in XCode. Tested on Mac (Makefile and XCode) and Linux. --- SetFlags.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'SetFlags.cmake') diff --git a/SetFlags.cmake b/SetFlags.cmake index c5a3a0697..da69293f7 100644 --- a/SetFlags.cmake +++ b/SetFlags.cmake @@ -188,6 +188,9 @@ macro(set_exe_flags) add_flags_cxx("-ffast-math") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + if (APPLE) + add_flags_cxx("-stdlib=libc++") + endif() # clang does not provide the __extern_always_inline macro and a part of libm depends on this when using fast-math add_flags_cxx("-D__extern_always_inline=inline") add_flags_cxx("-Werror -Weverything -Wno-c++98-compat-pedantic -Wno-string-conversion") -- cgit v1.2.3 From 0f9e399351ed4d83d397ef71ea575c1fdf77e981 Mon Sep 17 00:00:00 2001 From: archshift Date: Fri, 25 Apr 2014 10:32:39 -0700 Subject: Move to line 47. --- SetFlags.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'SetFlags.cmake') diff --git a/SetFlags.cmake b/SetFlags.cmake index da69293f7..7b2b6379e 100644 --- a/SetFlags.cmake +++ b/SetFlags.cmake @@ -45,6 +45,7 @@ macro(set_flags) 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_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11") + add_flags_cxx("-stdlib=libc++") else() add_flags_cxx("-pthread") endif() @@ -188,9 +189,6 @@ macro(set_exe_flags) add_flags_cxx("-ffast-math") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - if (APPLE) - add_flags_cxx("-stdlib=libc++") - endif() # clang does not provide the __extern_always_inline macro and a part of libm depends on this when using fast-math add_flags_cxx("-D__extern_always_inline=inline") add_flags_cxx("-Werror -Weverything -Wno-c++98-compat-pedantic -Wno-string-conversion") -- cgit v1.2.3 From d094beb45ab3ed6ba6ac086093926747df1f98a8 Mon Sep 17 00:00:00 2001 From: archshift Date: Fri, 25 Apr 2014 16:40:57 -0700 Subject: Needs the -stdlib linker flag too. --- SetFlags.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'SetFlags.cmake') diff --git a/SetFlags.cmake b/SetFlags.cmake index 7b2b6379e..4eed529bd 100644 --- a/SetFlags.cmake +++ b/SetFlags.cmake @@ -46,6 +46,7 @@ macro(set_flags) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11") add_flags_cxx("-stdlib=libc++") + add_flags_lnk("-stdlib=libc++") else() add_flags_cxx("-pthread") endif() -- cgit v1.2.3