diff options
author | 2017-12-17 15:52:34 -0500 | |
---|---|---|
committer | 2017-12-17 15:52:34 -0500 | |
commit | d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c (patch) | |
tree | 4444227f247f9b7cdb854144eb4332e607c34987 /CMakeLists.txt | |
parent | Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15 (diff) | |
download | sway-d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c.tar.gz sway-d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c.tar.zst sway-d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c.zip |
Revert "Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15"
This reverts commit 1c4a086e7556475139960a25cb642f115d057c23, reversing
changes made to 1263ea6497c732bfa1835eea4a8ffe2e6ea6e377.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index dc521570..99081dca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -9,17 +9,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) | |||
9 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) | 9 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) |
10 | add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-result -Werror) | 10 | add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-result -Werror) |
11 | 11 | ||
12 | # Add Address Sanitiezed build type | ||
13 | set(CMAKE_C_FLAGS_ASAN | ||
14 | "${CMAKE_C_FLAGS_DEBUG} -fsanitize=address -fno-omit-frame-pointer" | ||
15 | CACHE STRING "Flags used by the C compiler during address sanitizer builds." | ||
16 | FORCE ) | ||
17 | mark_as_advanced( | ||
18 | CMAKE_C_FLAGS_ASAN | ||
19 | CMAKE_EXE_LINKER_FLAGS_DEBUG | ||
20 | CMAKE_SHARED_LINKER_FLAGS_DEBUG | ||
21 | ) | ||
22 | |||
23 | list(INSERT CMAKE_MODULE_PATH 0 | 12 | list(INSERT CMAKE_MODULE_PATH 0 |
24 | ${CMAKE_CURRENT_SOURCE_DIR}/CMake | 13 | ${CMAKE_CURRENT_SOURCE_DIR}/CMake |
25 | ) | 14 | ) |