From 0d2baa1c89a845782cba37f62f6a7d38cfab6b62 Mon Sep 17 00:00:00 2001 From: Ranieri Althoff Date: Tue, 24 Oct 2017 01:43:11 +0000 Subject: Use add_compile_options instead of interpolation Uses CMake's `add_compile_options` directive instead of interpolating `CMAKE_C_FLAGS` for adding compilation flags. --- CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'CMakeLists.txt') 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) project(sway C) -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g") +add_compile_options(-g) set(CMAKE_C_STANDARD 99) set(CMAKE_C_EXTENSIONS OFF) set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-result") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") +add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-result -Werror) list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_SOURCE_DIR}/CMake -- cgit v1.2.3-70-g09d2 From 3d209be3d64081ee47f39d7e494830a73b178a72 Mon Sep 17 00:00:00 2001 From: Dan Robertson Date: Thu, 26 Oct 2017 14:07:36 +0000 Subject: Add Address Sanitized build type - Add -DCMAKE_BUILD_TYPE=ASAN to possible builds --- .travis.yml | 7 ++++++- CMakeLists.txt | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/.travis.yml b/.travis.yml index 69634765..3eeb1682 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,11 @@ compiler: - gcc - clang +env: + - BUILD_TYPE=Release + - BUILD_TYPE=Debug + - BUILD_TYPE=ASAN + arch: packages: - cmake @@ -19,7 +24,7 @@ arch: - wlc-git - libcap script: - - "cmake ." + - "cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE ." - "make" script: diff --git a/CMakeLists.txt b/CMakeLists.txt index b253f1fc..36763005 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,17 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-result -Werror) +# Add Address Sanitiezed build type +set(CMAKE_C_FLAGS_ASAN + "${CMAKE_C_FLAGS_DEBUG} -fsanitize=address -fno-omit-frame-pointer" + CACHE STRING "Flags used by the C compiler during address sanitizer builds." + FORCE ) +mark_as_advanced( + CMAKE_C_FLAGS_ASAN + CMAKE_EXE_LINKER_FLAGS_DEBUG + CMAKE_SHARED_LINKER_FLAGS_DEBUG + ) + list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_SOURCE_DIR}/CMake ) -- cgit v1.2.3-70-g09d2 From 69e9b1386ffa2f78bfa69ccd84e815c9f1d5920e Mon Sep 17 00:00:00 2001 From: Marius Orcsik Date: Fri, 27 Oct 2017 12:14:40 +0200 Subject: Explicitly setting the version of json-c required to 0.12.1. This is needed because the development version breaks the existing API of json_object_array_length() by moving the return from int to size_t. This would fix #1355 --- CMake/FindJsonC.cmake | 16 ++++++++++++++-- CMakeLists.txt | 2 +- README.de.md | 2 +- README.el.md | 2 +- README.fr.md | 2 +- README.it.md | 2 +- README.ja.md | 2 +- README.md | 2 +- README.pt.md | 2 +- README.ru.md | 2 +- README.uk.md | 2 +- 11 files changed, 24 insertions(+), 12 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMake/FindJsonC.cmake b/CMake/FindJsonC.cmake index 2ca0df39..bbf6930c 100644 --- a/CMake/FindJsonC.cmake +++ b/CMake/FindJsonC.cmake @@ -8,10 +8,22 @@ # find_package(PkgConfig) -pkg_check_modules(PC_JSONC QUIET JSONC) + +if (JsonC_FIND_REQUIRED) + set(_pkgconfig_REQUIRED "REQUIRED") +else() + set(_pkgconfig_REQUIRED "") +endif() + +if(JsonC_FIND_VERSION) + pkg_check_modules(PC_JSONC ${_pkgconfig_REQUIRED} json-c=${JsonC_FIND_VERSION}) +else() + pkg_check_modules(PC_JSONC ${_pkgconfig_REQUIRED} json-c) +endif() + find_path(JSONC_INCLUDE_DIRS NAMES json-c/json.h HINTS ${PC_JSONC_INCLUDE_DIRS}) find_library(JSONC_LIBRARIES NAMES json-c HINTS ${PC_JSONC_LIBRARY_DIRS}) - include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(JSONC DEFAULT_MSG JSONC_LIBRARIES JSONC_INCLUDE_DIRS) mark_as_advanced(JSONC_LIBRARIES JSONC_INCLUDE_DIRS) diff --git a/CMakeLists.txt b/CMakeLists.txt index b253f1fc..bf37d9df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ if (LD_LIBRARY_PATH) add_definitions(-D_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}") endif() -find_package(JsonC REQUIRED) +find_package(JsonC 0.12.1 REQUIRED) find_package(PCRE REQUIRED) find_package(WLC REQUIRED) find_package(Wayland REQUIRED) diff --git a/README.de.md b/README.de.md index 92a15b99..1b0811ff 100644 --- a/README.de.md +++ b/README.de.md @@ -60,7 +60,7 @@ Abhängigkeiten: * libcap * asciidoc * pcre -* json-c +* json-c <= 0.12.1 * pango * cairo * gdk-pixbuf2 * diff --git a/README.el.md b/README.el.md index 1e5b8358..03a49ae7 100644 --- a/README.el.md +++ b/README.el.md @@ -53,7 +53,7 @@ To username μου στο Freenode είναι kon14 και θα με βρείτ * libcap * asciidoc * pcre -* json-c +* json-c <= 0.12.1 * pango * cairo * gdk-pixbuf2 * diff --git a/README.fr.md b/README.fr.md index 03b5a803..060ae063 100644 --- a/README.fr.md +++ b/README.fr.md @@ -55,7 +55,7 @@ Installez les dépendances : * libcap * asciidoc * pcre -* json-c +* json-c <= 0.12.1 * pango * cairo * gdk-pixbuf2 * diff --git a/README.it.md b/README.it.md index ca3e1ea3..58b965d8 100644 --- a/README.it.md +++ b/README.it.md @@ -56,7 +56,7 @@ Installa queste dipendenze: * libcap * asciidoc * pcre -* json-c +* json-c <= 0.12.1 * pango * cairo * gdk-pixbuf2 * diff --git a/README.ja.md b/README.ja.md index 7573ecc4..f8cbecb0 100644 --- a/README.ja.md +++ b/README.ja.md @@ -49,7 +49,7 @@ Swayは沢山のディストリビューションで提供されています。" * libcap * asciidoc * pcre -* json-c +* json-c <= 0.12.1 * pango * cairo * gdk-pixbuf2 * diff --git a/README.md b/README.md index 9dbbfdfe..33d52fb1 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Install dependencies: * libcap * asciidoc * pcre -* json-c +* json-c <= 0.12.1 * pango * cairo * gdk-pixbuf2 * diff --git a/README.pt.md b/README.pt.md index 96827623..7d105e42 100644 --- a/README.pt.md +++ b/README.pt.md @@ -62,7 +62,7 @@ Antes de iniciar a compilação, instale as dependências: * libcap * asciidoc * pcre -* json-c +* json-c <= 0.12.1 * pango * cairo * gdk-pixbuf2 * diff --git a/README.ru.md b/README.ru.md index 891adf99..2a27247c 100644 --- a/README.ru.md +++ b/README.ru.md @@ -55,7 +55,7 @@ Sway доступен во многих дистрибутивах и наход * libcap * asciidoc * pcre -* json-c +* json-c <= 0.12.1 * pango * cairo * gdk-pixbuf2 * diff --git a/README.uk.md b/README.uk.md index 02b64804..7cb3b95f 100644 --- a/README.uk.md +++ b/README.uk.md @@ -62,7 +62,7 @@ Sway доступний у багатьох дистрибутивах Linux (а * libcap * asciidoc * pcre -* json-c +* json-c <= 0.12.1 * pango * cairo * gdk-pixbuf2 * -- cgit v1.2.3-70-g09d2 From 462390089827952303a8d98ff5ae552d7d93b3d0 Mon Sep 17 00:00:00 2001 From: Adam Mizerski Date: Sun, 5 Nov 2017 20:19:38 +0100 Subject: Dbus must be at least version 1.10 Function dbus_message_iter_get_element_count is available since 1.10. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index bf373280..dc521570 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,7 @@ find_package(Cairo REQUIRED) find_package(Pango REQUIRED) find_package(GdkPixbuf) find_package(PAM) -find_package(DBus) +find_package(DBus 1.10) find_package(LibInput REQUIRED) -- cgit v1.2.3-70-g09d2 From c6e12368a531dd4bbb0778c9a1dd5d3fb935c197 Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Thu, 14 Dec 2017 01:30:54 +0100 Subject: Lift restriction on json-c <= 0.12.1 --- CMakeLists.txt | 2 +- README.de.md | 2 +- README.el.md | 2 +- README.fr.md | 2 +- README.it.md | 2 +- README.ja.md | 2 +- README.md | 2 +- README.pt.md | 2 +- README.ru.md | 2 +- README.uk.md | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index dc521570..bd12b191 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ if (LD_LIBRARY_PATH) add_definitions(-D_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}") endif() -find_package(JsonC 0.12.1 REQUIRED) +find_package(JsonC REQUIRED) find_package(PCRE REQUIRED) find_package(WLC REQUIRED) find_package(Wayland REQUIRED) diff --git a/README.de.md b/README.de.md index 701cc34f..293ffe70 100644 --- a/README.de.md +++ b/README.de.md @@ -60,7 +60,7 @@ Abhängigkeiten: * libcap * asciidoc * pcre -* json-c <= 0.12.1 +* json-c * pango * cairo * gdk-pixbuf2 * diff --git a/README.el.md b/README.el.md index df39364f..eba97b9c 100644 --- a/README.el.md +++ b/README.el.md @@ -53,7 +53,7 @@ To username μου στο Freenode είναι kon14 και θα με βρείτ * libcap * asciidoc * pcre -* json-c <= 0.12.1 +* json-c * pango * cairo * gdk-pixbuf2 * diff --git a/README.fr.md b/README.fr.md index 47b6c410..a4ff7cb9 100644 --- a/README.fr.md +++ b/README.fr.md @@ -55,7 +55,7 @@ Installez les dépendances : * libcap * asciidoc * pcre -* json-c <= 0.12.1 +* json-c * pango * cairo * gdk-pixbuf2 * diff --git a/README.it.md b/README.it.md index f5e0d8e2..ded441c3 100644 --- a/README.it.md +++ b/README.it.md @@ -56,7 +56,7 @@ Installa queste dipendenze: * libcap * asciidoc * pcre -* json-c <= 0.12.1 +* json-c * pango * cairo * gdk-pixbuf2 * diff --git a/README.ja.md b/README.ja.md index 2e8f9bfb..94b4ce9d 100644 --- a/README.ja.md +++ b/README.ja.md @@ -46,7 +46,7 @@ Swayは沢山のディストリビューションで提供されています。" * libcap * asciidoc * pcre -* json-c <= 0.12.1 +* json-c * pango * cairo * gdk-pixbuf2 * diff --git a/README.md b/README.md index 29e8a674..eeca9f88 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Install dependencies: * libcap * asciidoc * pcre -* json-c <= 0.12.1 +* json-c * pango * cairo * gdk-pixbuf2 * diff --git a/README.pt.md b/README.pt.md index b5ca132f..e35849ec 100644 --- a/README.pt.md +++ b/README.pt.md @@ -62,7 +62,7 @@ Antes de iniciar a compilação, instale as dependências: * libcap * asciidoc * pcre -* json-c <= 0.12.1 +* json-c * pango * cairo * gdk-pixbuf2 * diff --git a/README.ru.md b/README.ru.md index 4035b0fc..1551caa0 100644 --- a/README.ru.md +++ b/README.ru.md @@ -55,7 +55,7 @@ Sway доступен во многих дистрибутивах и наход * libcap * asciidoc * pcre -* json-c <= 0.12.1 +* json-c * pango * cairo * gdk-pixbuf2 * diff --git a/README.uk.md b/README.uk.md index 2e107afc..c8520e4b 100644 --- a/README.uk.md +++ b/README.uk.md @@ -62,7 +62,7 @@ Sway доступний у багатьох дистрибутивах Linux (а * libcap * asciidoc * pcre -* json-c <= 0.12.1 +* json-c * pango * cairo * gdk-pixbuf2 * -- cgit v1.2.3-70-g09d2