aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2017-10-23 21:48:31 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2017-10-30 17:23:21 -0400
commitd0367d1a6708f797bab1a9e2cd744b6e9bf2a49d (patch)
treef3b737ba214d90f402191c5c982bef61789bb551
parentMerge pull request #1425 from ggreer/grab-error (diff)
downloadsway-d0367d1a6708f797bab1a9e2cd744b6e9bf2a49d.tar.gz
sway-d0367d1a6708f797bab1a9e2cd744b6e9bf2a49d.tar.zst
sway-d0367d1a6708f797bab1a9e2cd744b6e9bf2a49d.zip
Merge pull request #1427 from ranisalt/patch-1
Use add_compile_options instead of interpolation
-rw-r--r--CMakeLists.txt8
1 files changed, 2 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95f539e7..b253f1fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,16 +2,12 @@ cmake_minimum_required(VERSION 3.1.0)
2 2
3project(sway C) 3project(sway C)
4 4
5set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g") 5add_compile_options(-g)
6set(CMAKE_C_STANDARD 99) 6set(CMAKE_C_STANDARD 99)
7set(CMAKE_C_EXTENSIONS OFF) 7set(CMAKE_C_EXTENSIONS OFF)
8set(CMAKE_POSITION_INDEPENDENT_CODE ON) 8set(CMAKE_POSITION_INDEPENDENT_CODE ON)
9set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) 9set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
10set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") 10add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-result -Werror)
11set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
12set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter")
13set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-result")
14set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
15 11
16list(INSERT CMAKE_MODULE_PATH 0 12list(INSERT CMAKE_MODULE_PATH 0
17 ${CMAKE_CURRENT_SOURCE_DIR}/CMake 13 ${CMAKE_CURRENT_SOURCE_DIR}/CMake