summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Hildebrandt <afh@surryhill.net>2023-06-07 10:39:51 +0200
committerAlexis Hildebrandt <afh@surryhill.net>2023-06-07 10:39:51 +0200
commit8e64a1cf7009bbe7b89dc8bcb7abd00e39815b0b (patch)
treec970c06489e75e31d832ac6dc7d24430fc569aee
parent5e2afd286a332b93481750821be4785fbbd555a4 (diff)
downloadfork-ledger-8e64a1cf7009bbe7b89dc8bcb7abd00e39815b0b.tar.gz
fork-ledger-8e64a1cf7009bbe7b89dc8bcb7abd00e39815b0b.tar.bz2
fork-ledger-8e64a1cf7009bbe7b89dc8bcb7abd00e39815b0b.zip
cmake: Replace add_defitions with superseding alternatives
-rw-r--r--CMakeLists.txt8
-rw-r--r--src/CMakeLists.txt6
2 files changed, 6 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 712aa714..a6a05501 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,12 +19,10 @@ set(Ledger_TEST_TIMEZONE "America/Chicago")
enable_testing()
-add_definitions(
- -std=c++11
- -DBOOST_FILESYSTEM_NO_DEPRECATED
-)
+add_compile_definitions(BOOST_FILESYSTEM_NO_DEPRECATED)
+add_compile_options(-std=c++11)
if (CYGWIN)
- add_definitions(-U__STRICT_ANSI__)
+ add_compile_options(-U__STRICT_ANSI__)
endif()
########################################################################
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f229d70c..a40cc1ff 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -149,7 +149,7 @@ endif()
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
- add_definitions(
+ add_compile_options(
# -Weverything
# -Wno-disabled-macro-expansion
# -Wno-padded
@@ -223,7 +223,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-Wno-deprecated
-Wno-strict-aliasing)
- add_definitions(${GXX_WARNING_FLAGS})
+ add_compile_options(${GXX_WARNING_FLAGS})
macro(ADD_PCH_RULE _header_filename _src_list _other_srcs)
set(_gch_filename "${_header_filename}.gch")
@@ -288,7 +288,7 @@ if (BUILD_LIBRARY)
VERSION ${Ledger_VERSION_MAJOR}
SOVERSION ${Ledger_VERSION_MAJOR})
- add_executable(ledger main.cc global.cc)
+ add_executable(ledger ${LEDGER_CLI_SOURCES})
target_link_libraries(ledger libledger)
if (HAVE_GPGME)
target_link_libraries(ledger Gpgmepp)