IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

More conversions from pkg-config variables to imported targets.

Browse Source 
Also converts ICU detection from pkgconfig to FindICU.
This commit is contained in:
John Ralls
2019-09-13 17:02:41 -07:00
parent e4eedfe662
commit 1a9fcfefad
36 changed files with 90 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libgnucash/gnc-module/CMakeLists.txt
View File

@@ -24,16 +24,14 @@ add_library (gnc-module
${SWIG_GNC_MODULE_C}
)
target_link_libraries(gnc-module ${GUILE_LDFLAGS} ${GMODULE_LDFLAGS} ${GLIB2_LDFLAGS})
target_link_libraries(gnc-module PkgConfig::GUILE PkgConfig::GMODULE PkgConfig::GLIB2)
target_compile_definitions (gnc-module PRIVATE -DG_LOG_DOMAIN=\"gnc.module\")
target_include_directories (gnc-module
PRIVATE ${GUILE_INCLUDE_DIRS}
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/common
${CMAKE_BINARY_DIR}/common # for config.h
${GLIB2_INCLUDE_DIRS}
)
install(TARGETS gnc-module

2
libgnucash/gnc-module/test/CMakeLists.txt
View File

@@ -8,8 +8,6 @@ set(GNC_MODULE_TEST_INCLUDE_DIRS
${CMAKE_BINARY_DIR}/common # for config.h
${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
${CMAKE_SOURCE_DIR}/common/test-core
${GLIB2_INCLUDE_DIRS}
${GUILE_INCLUDE_DIRS}
)
set(GNC_MODULE_TEST_LIBS

7
libgnucash/gnc-module/test/misc-mods/CMakeLists.txt
View File

@@ -1,17 +1,16 @@
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
${GLIB2_INCLUDE_DIRS}
)
add_library(gncmod-agedver EXCLUDE_FROM_ALL agedver.c)
target_link_libraries(gncmod-agedver ${GLIB2_LDFLAGS})
target_link_libraries(gncmod-agedver PkgConfig::GLIB2)
add_library(gncmod-futuremodsys EXCLUDE_FROM_ALL futuremodsys.c)
target_link_libraries(gncmod-futuremodsys ${GLIB2_LDFLAGS})
target_link_libraries(gncmod-futuremodsys PkgConfig::GLIB2)
add_library(gncmod-incompatdep EXCLUDE_FROM_ALL incompatdep.c)
target_link_libraries(gncmod-incompatdep gnc-module ${GLIB2_LDFLAGS})
target_link_libraries(gncmod-incompatdep gnc-module PkgConfig::GLIB2)
set_target_properties(gncmod-agedver gncmod-futuremodsys gncmod-incompatdep PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test

2
libgnucash/gnc-module/test/mod-bar/CMakeLists.txt
View File

@@ -15,8 +15,6 @@ target_include_directories(gncmod-bar PRIVATE
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/common
${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
${GLIB2_INCLUDE_DIRS}
${GUILE_INCLUDE_DIRS}
)
gnc_add_scheme_test_targets(scm-mod-bar

2
libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
View File

@@ -21,8 +21,6 @@ target_include_directories(gncmod-baz PRIVATE
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/common
${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
${GLIB2_INCLUDE_DIRS}
${GUILE_INCLUDE_DIRS}
)
gnc_add_scheme_test_targets(scm-mod-baz

2
libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
View File

@@ -15,8 +15,6 @@ target_include_directories(gncmod-foo PRIVATE
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/common
${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
${GLIB2_INCLUDE_DIRS}
${GUILE_INCLUDE_DIRS}
)
gnc_add_scheme_test_targets(scm-mod-foo