Merge branch 'master' of github.com:cginternals/cmake-init

scheibel · scheibel · commit 0d9ca765db34 · 2017-03-28T13:11:15.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -36,3 +36,6 @@ _start-cmd.bat
 
 # Local config unix
 .localconfig
+
+# Wiki
+wiki
diff --git a/cmake/CompileOptions.cmake b/cmake/CompileOptions.cmake
@@ -119,7 +119,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCH
         $<$<CXX_COMPILER_ID:Clang>:
             -Wpedantic
             
-            -Wreturn-stack-address
+            # -Wreturn-stack-address # gives false positives
         >
         
         $<$<PLATFORM_ID:Darwin>:

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCH`
`119`	`119`	`$<$<CXX_COMPILER_ID:Clang>:`
`120`	`120`	`-Wpedantic`
`121`	`121`
`122`		`- -Wreturn-stack-address`
	`122`	`+ # -Wreturn-stack-address # gives false positives`
`123`	`123`	`>`
`124`	`124`
`125`	`125`	`$<$<PLATFORM_ID:Darwin>:`