mirror of
https://github.com/ivabus/pantry
synced 2024-11-10 02:25:18 +03:00
parent
e15a53549a
commit
62494914a1
|
@ -1,23 +0,0 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index c3062e2..0ed2c1c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -61,18 +61,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
|
||||
endif(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
|
||||
|
||||
- # Use -Wextra for clang and gcc.
|
||||
- if(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
|
||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
|
||||
- endif(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
|
||||
-
|
||||
- # Use -Werror for clang only.
|
||||
- if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
- if(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
|
||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
|
||||
- endif(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
|
||||
- endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
-
|
||||
# Disable C++ exceptions.
|
||||
string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
|
|
@ -12,11 +12,8 @@ build:
|
|||
gnu.org/patch: '*'
|
||||
script:
|
||||
# disable -Werror (because there are warnings lol)
|
||||
- patch -p1 <props/CMakeLists.txt.patch
|
||||
# disable no-rtti, since it messes up folly
|
||||
- run: |
|
||||
sed -i.bak -e '/# Disable RTTI./{N;N;d;}' CMakeLists.txt
|
||||
rm CMakeLists.txt.bak
|
||||
- sed -i -e 's/ -Werror//g' -e '/# Disable RTTI./{N;N;d;}' CMakeLists.txt
|
||||
- cmake . $ARGS
|
||||
- make install
|
||||
- make clean
|
||||
|
|
Loading…
Reference in a new issue