mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
CMake - remove parameter repetition in else() and endif() statements
This follows Professional CMake's recommended practises
This commit is contained in:
parent
8365283f18
commit
e79e82edcf
@ -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)
|
||||
|
@ -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()
|
||||
|
@ -81,4 +81,4 @@ if(WITH_SQL)
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
|
||||
# No headers to install
|
||||
endif(WITH_SQL)
|
||||
endif()
|
||||
|
@ -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()
|
||||
|
@ -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)
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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})
|
||||
|
@ -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)
|
||||
|
@ -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}"
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user