mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Revert "More conversions from pkg-config variables to imported targets."
This reverts commit 1a9fcfefad because
on MinGW cmake complains about the paths in pkgconfig files. This can
be addressed by using the MSYS2 cmake instead of the MINGW32 one, but
that requires some other changes... and there's also a path separator
bug in that version of FindPkgConfig.cmake.
This commit is contained in:
@@ -24,14 +24,16 @@ add_library (gnc-module
|
||||
${SWIG_GNC_MODULE_C}
|
||||
)
|
||||
|
||||
target_link_libraries(gnc-module PkgConfig::GUILE PkgConfig::GMODULE PkgConfig::GLIB2)
|
||||
target_link_libraries(gnc-module ${GUILE_LDFLAGS} ${GMODULE_LDFLAGS} ${GLIB2_LDFLAGS})
|
||||
|
||||
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
|
||||
|
||||
@@ -8,6 +8,8 @@ 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
|
||||
|
||||
@@ -1,16 +1,17 @@
|
||||
|
||||
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 PkgConfig::GLIB2)
|
||||
target_link_libraries(gncmod-agedver ${GLIB2_LDFLAGS})
|
||||
|
||||
add_library(gncmod-futuremodsys EXCLUDE_FROM_ALL futuremodsys.c)
|
||||
target_link_libraries(gncmod-futuremodsys PkgConfig::GLIB2)
|
||||
target_link_libraries(gncmod-futuremodsys ${GLIB2_LDFLAGS})
|
||||
|
||||
add_library(gncmod-incompatdep EXCLUDE_FROM_ALL incompatdep.c)
|
||||
target_link_libraries(gncmod-incompatdep gnc-module PkgConfig::GLIB2)
|
||||
target_link_libraries(gncmod-incompatdep gnc-module ${GLIB2_LDFLAGS})
|
||||
|
||||
set_target_properties(gncmod-agedver gncmod-futuremodsys gncmod-incompatdep PROPERTIES
|
||||
LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
|
||||
|
||||
@@ -15,6 +15,8 @@ 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
|
||||
|
||||
@@ -21,6 +21,8 @@ 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
|
||||
|
||||
@@ -15,6 +15,8 @@ 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
|
||||
|
||||
Reference in New Issue
Block a user