gnucash maint: CMake - remove parameter repetition in else() and endif() statements
Geert Janssens
gjanssens at code.gnucash.org
Wed Feb 5 09:59:11 EST 2020
Updated via https://github.com/Gnucash/gnucash/commit/e79e82ed (commit)
from https://github.com/Gnucash/gnucash/commit/8365283f (commit)
commit e79e82edcfe8db67d17d950b001e9ab196b720f3
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Jan 30 12:20:25 2020 +0100
CMake - remove parameter repetition in else() and endif() statements
This follows Professional CMake's recommended practises
diff --git a/libgnucash/app-utils/test/CMakeLists.txt b/libgnucash/app-utils/test/CMakeLists.txt
index 435250c60..484820c49 100644
--- a/libgnucash/app-utils/test/CMakeLists.txt
+++ b/libgnucash/app-utils/test/CMakeLists.txt
@@ -68,7 +68,7 @@ gnc_add_scheme_tests("${test_app_utils_scheme_SOURCES}")
if (HAVE_SRFI64)
gnc_add_scheme_tests("${test_app_utils_scheme_SRFI64_SOURCES}")
-endif ()
+endif()
# Doesn't work yet:
gnc_add_test_with_guile(test-app-utils "${test_app_utils_SOURCES}" APP_UTILS_TEST_INCLUDE_DIRS APP_UTILS_TEST_LIBS)
diff --git a/libgnucash/backend/dbi/CMakeLists.txt b/libgnucash/backend/dbi/CMakeLists.txt
index ff7d760c7..668e3e096 100644
--- a/libgnucash/backend/dbi/CMakeLists.txt
+++ b/libgnucash/backend/dbi/CMakeLists.txt
@@ -32,7 +32,7 @@ if (WITH_SQL)
set(WINSOCK_LIB "")
if(MINGW64)
set(WINSOCK_LIB "-lws2_32")
- endif(MINGW64)
+ endif()
target_link_libraries(gncmod-backend-dbi gnc-backend-sql gncmod-engine ${GTK2_LDFLAGS} ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY} ${WINSOCK_LIB})
target_compile_definitions(gncmod-backend-dbi PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.dbi\")
@@ -48,4 +48,4 @@ if (WITH_SQL)
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
# No headers to install
-endif(WITH_SQL)
+endif()
diff --git a/libgnucash/backend/sql/CMakeLists.txt b/libgnucash/backend/sql/CMakeLists.txt
index ebd2a8324..8949546d2 100644
--- a/libgnucash/backend/sql/CMakeLists.txt
+++ b/libgnucash/backend/sql/CMakeLists.txt
@@ -81,4 +81,4 @@ if(WITH_SQL)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
# No headers to install
-endif(WITH_SQL)
+endif()
diff --git a/libgnucash/backend/sql/test/CMakeLists.txt b/libgnucash/backend/sql/test/CMakeLists.txt
index d0c06ccfc..cb1b6ecb6 100644
--- a/libgnucash/backend/sql/test/CMakeLists.txt
+++ b/libgnucash/backend/sql/test/CMakeLists.txt
@@ -24,4 +24,4 @@ if(WITH_SQL)
BACKEND_SQL_TEST_INCLUDE_DIRS BACKEND_SQL_TEST_LIBS
)
target_compile_definitions(test-sqlbe PRIVATE TESTPROG=test_sqlbe)
-endif(WITH_SQL)
+endif()
diff --git a/libgnucash/backend/xml/CMakeLists.txt b/libgnucash/backend/xml/CMakeLists.txt
index 3c5c96dd3..d7dff2a08 100644
--- a/libgnucash/backend/xml/CMakeLists.txt
+++ b/libgnucash/backend/xml/CMakeLists.txt
@@ -112,7 +112,7 @@ target_compile_definitions (gncmod-backend-xml PRIVATE -DG_LOG_DOMAIN=\"gnc.back
set(LIB_DIR ${CMAKE_INSTALL_LIBDIR}/gnucash)
if (WIN32)
set(LIB_DIR ${CMAKE_INSTALL_BINDIR})
-endif(WIN32)
+endif()
if (APPLE)
diff --git a/libgnucash/core-utils/CMakeLists.txt b/libgnucash/core-utils/CMakeLists.txt
index 3960cd7c4..c12fe3dee 100644
--- a/libgnucash/core-utils/CMakeLists.txt
+++ b/libgnucash/core-utils/CMakeLists.txt
@@ -72,9 +72,9 @@ add_custom_target(gnc-vcs-info ALL
-D SHELL="${SHELL}"
-P ${CMAKE_SOURCE_DIR}/cmake/git2version-info.cmake
)
-else(BUILDING_FROM_VCS)
+else()
add_custom_target(gnc-vcs-info DEPENDS ${VCS_INFO_FILE})
-endif(BUILDING_FROM_VCS)
+endif()
dist_add_generated (${BUILDING_FROM_VCS} gnc-vcs-info.h)
### Compile library
@@ -124,10 +124,10 @@ target_include_directories(gnc-core-utils PUBLIC ${core_utils_ALL_INCLUDES})
if (MAC_INTEGRATION)
target_compile_options(gnc-core-utils PRIVATE ${OSX_EXTRA_COMPILE_FLAGS})
-endif(MAC_INTEGRATION)
+endif()
if (BUILDING_FROM_VCS)
target_compile_definitions(gnc-core-utils PRIVATE -DGNC_VCS=\"git\")
-endif (BUILDING_FROM_VCS)
+endif()
install(TARGETS gnc-core-utils
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
diff --git a/libgnucash/core-utils/test/CMakeLists.txt b/libgnucash/core-utils/test/CMakeLists.txt
index 6da6d16a5..29e629f94 100644
--- a/libgnucash/core-utils/test/CMakeLists.txt
+++ b/libgnucash/core-utils/test/CMakeLists.txt
@@ -25,7 +25,7 @@ endif()
if (MAC_INTEGRATION)
target_compile_options(test-userdata-dir PRIVATE ${OSX_EXTRA_COMPILE_FLAGS})
target_compile_definitions(test-userdata-dir PRIVATE ${GTK_MAC_CFLAGS_OTHER})
-endif(MAC_INTEGRATION)
+endif()
set(gtest_core_utils_INCLUDES
${MODULEPATH}
diff --git a/libgnucash/doc/design/CMakeLists.txt b/libgnucash/doc/design/CMakeLists.txt
index 4a35ebe79..17a91748c 100644
--- a/libgnucash/doc/design/CMakeLists.txt
+++ b/libgnucash/doc/design/CMakeLists.txt
@@ -38,7 +38,7 @@ if (NOT ${MAKEINFO} STREQUAL "MAKEINFO-NOTFOUND")
COMMAND ${MAKEINFO} -I ${TEXI_BINARY_DIR} ${TEXI_SOURCE_FILE}
DEPENDS ${gnucash_design_TEXINFOS}
)
-endif (NOT ${MAKEINFO} STREQUAL "MAKEINFO-NOTFOUND")
+endif()
dist_add_generated (${BUILDING_FROM_VCS} gnucash-design.info)
set_dist_list(doc_design_DIST CMakeLists.txt gnucash-design.texi ${gnucash_design_TEXINFOS})
diff --git a/libgnucash/engine/CMakeLists.txt b/libgnucash/engine/CMakeLists.txt
index 8af499ece..62c760b28 100644
--- a/libgnucash/engine/CMakeLists.txt
+++ b/libgnucash/engine/CMakeLists.txt
@@ -212,7 +212,7 @@ if (WIN32)
qof-win32.cpp
../../borrowed/libc/strptime.c
)
-endif (WIN32)
+endif()
# Add dependency on config.h
set_source_files_properties (${engine_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
@@ -281,7 +281,7 @@ set (engine_SCHEME_1
set(BACKEND_DEPENDS gncmod-backend-xml)
if (WITH_SQL)
list(APPEND BACKEND_DEPENDS gncmod-backend-dbi)
-endif(WITH_SQL)
+endif()
set(GUILE_DEPENDS
${BACKEND_DEPENDS}
@@ -321,7 +321,7 @@ set(engine_EXTRA_DIST
if (NOT WIN32)
list(APPEND engine_EXTRA_DIST qof-win32.cpp)
-endif (NOT WIN32)
+endif()
set_local_dist(engine_DIST_local CMakeLists.txt ${engine_SOURCES} ${engine_HEADERS}
${engine_noinst_HEADERS} ${engine_SCHEME_0} ${engine_SCHEME_1} ${engine_EXTRA_DIST})
set(engine_DIST ${engine_DIST_local} ${engine_test_core_DIST} ${test_engine_DIST} PARENT_SCOPE)
diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt
index c04871054..49d4b89f9 100644
--- a/libgnucash/engine/test/CMakeLists.txt
+++ b/libgnucash/engine/test/CMakeLists.txt
@@ -119,7 +119,7 @@ if (WIN32)
${MODULEPATH}/qof-win32.cpp
../../../borrowed/libc/strptime.c
)
-endif (WIN32)
+endif()
set(test_gnc_guid_SOURCES
${MODULEPATH}/guid.cpp
@@ -244,7 +244,7 @@ if (HAVE_SRFI64)
gnc_add_scheme_tests("${scm_tests_with_srfi64_SOURCES}")
add_dependencies(check scm-srfi64-extras)
-endif (HAVE_SRFI64)
+endif()
gnc_add_scheme_targets(scm-test-engine
"${engine_test_SCHEME}"
diff --git a/libgnucash/scm/test/CMakeLists.txt b/libgnucash/scm/test/CMakeLists.txt
index 677d6124a..c9cdbc7c6 100644
--- a/libgnucash/scm/test/CMakeLists.txt
+++ b/libgnucash/scm/test/CMakeLists.txt
@@ -19,7 +19,7 @@ if (HAVE_SRFI64)
gnc_add_scheme_tests("${scm_test_SCHEME}")
-endif (HAVE_SRFI64)
+endif()
set_dist_list(test_scm_DIST
CMakeLists.txt
Summary of changes:
libgnucash/app-utils/test/CMakeLists.txt | 2 +-
libgnucash/backend/dbi/CMakeLists.txt | 4 ++--
libgnucash/backend/sql/CMakeLists.txt | 2 +-
libgnucash/backend/sql/test/CMakeLists.txt | 2 +-
libgnucash/backend/xml/CMakeLists.txt | 2 +-
libgnucash/core-utils/CMakeLists.txt | 8 ++++----
libgnucash/core-utils/test/CMakeLists.txt | 2 +-
libgnucash/doc/design/CMakeLists.txt | 2 +-
libgnucash/engine/CMakeLists.txt | 6 +++---
libgnucash/engine/test/CMakeLists.txt | 4 ++--
libgnucash/scm/test/CMakeLists.txt | 2 +-
11 files changed, 18 insertions(+), 18 deletions(-)
More information about the gnucash-changes
mailing list