From 52c737233e6e1eccc631a9795cb5ffde72fb50d2 Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 16 Sep 2017 11:00:31 +0200 Subject: [PATCH] compatibility to cmake < 3.0 (fixes #105) --- CMakeLists.txt | 4 ++-- src/ebusd/CMakeLists.txt | 2 +- src/lib/ebus/CMakeLists.txt | 2 +- src/lib/ebus/contrib/CMakeLists.txt | 2 +- src/lib/ebus/test/CMakeLists.txt | 2 +- src/lib/utils/CMakeLists.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a6ffe31..56faba15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ include(CheckFunctionExists) include(CheckCXXSourceRuns) include(CheckIncludeFile) -add_compile_options(-fpic -Wall -Wno-unused-function -Wextra) +add_definitions(-fpic -Wall -Wno-unused-function -Wextra) check_include_file(arpa/inet.h HAVE_ARPA_INET_H) check_include_file(dirent.h HAVE_DIRENT_H) @@ -65,7 +65,7 @@ endif(NOT HAVE_ARGP) option(coverage "enable code coverage tracking." OFF) if(NOT coverage STREQUAL OFF) - add_compile_options(-coverage -O0) + add_definitions(-coverage -O0) message(STATUS "coverage enabled") endif(NOT coverage STREQUAL OFF) option(contrib "disable inclusion of contributed sources." ON) diff --git a/src/ebusd/CMakeLists.txt b/src/ebusd/CMakeLists.txt index 38291a68..8cf76267 100644 --- a/src/ebusd/CMakeLists.txt +++ b/src/ebusd/CMakeLists.txt @@ -1,4 +1,4 @@ -add_compile_options(-Wconversion -Wno-unused-parameter) +add_definitions(-Wconversion -Wno-unused-parameter) set(ebusd_SOURCES bushandler.cpp diff --git a/src/lib/ebus/CMakeLists.txt b/src/lib/ebus/CMakeLists.txt index 2ea55e0c..6f07f444 100644 --- a/src/lib/ebus/CMakeLists.txt +++ b/src/lib/ebus/CMakeLists.txt @@ -1,4 +1,4 @@ -add_compile_options(-Wconversion -Wno-unused-parameter) +add_definitions(-Wconversion -Wno-unused-parameter) set(libebus_a_SOURCES result.cpp diff --git a/src/lib/ebus/contrib/CMakeLists.txt b/src/lib/ebus/contrib/CMakeLists.txt index f1ff1b85..8bfe5533 100644 --- a/src/lib/ebus/contrib/CMakeLists.txt +++ b/src/lib/ebus/contrib/CMakeLists.txt @@ -1,4 +1,4 @@ -add_compile_options(-Wno-unused-parameter) +add_definitions(-Wno-unused-parameter) set(libebuscontrib_a_SOURCES contrib.cpp diff --git a/src/lib/ebus/test/CMakeLists.txt b/src/lib/ebus/test/CMakeLists.txt index 6964714c..002d779d 100644 --- a/src/lib/ebus/test/CMakeLists.txt +++ b/src/lib/ebus/test/CMakeLists.txt @@ -1,4 +1,4 @@ -add_compile_options(-Wno-unused-parameter) +add_definitions(-Wno-unused-parameter) if(HAVE_CONTRIB) set(test_LIBS ${test_LIBS} ebuscontrib) diff --git a/src/lib/utils/CMakeLists.txt b/src/lib/utils/CMakeLists.txt index 1113e273..9257e331 100644 --- a/src/lib/utils/CMakeLists.txt +++ b/src/lib/utils/CMakeLists.txt @@ -1,4 +1,4 @@ -add_compile_options(-Wconversion) +add_definitions(-Wconversion) set(libutils_a_SOURCES log.cpp