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

Switch to building with the gtk+-3.0 toolkit

Browse Source
This commit is contained in:
Geert Janssens 2015-08-22 10:48:04 +02:00 committed by Geert Janssens
parent 6edbb53fe6
commit 2528bfde6b
19 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -172,7 +172,7 @@ GNC_PKG_CHECK_MODULES (LIBXML2 REQUIRED libxml-2.0>=2.7.0)
GNC_PKG_CHECK_MODULES (LIBXSLT REQUIRED libxslt)
GNC_PKG_CHECK_MODULES (WEBKIT REQUIRED webkit-1.0>=1.2)
IF (WITH_GNUCASH)
GNC_PKG_CHECK_MODULES (GTK2 REQUIRED gtk+-2.0>=2.24.0)
GNC_PKG_CHECK_MODULES (GTK3 REQUIRED gtk+-3.0>=3.14.0)
ENDIF (WITH_GNUCASH)
GNC_PKG_CHECK_MODULES (ZLIB REQUIRED zlib)

2
configure.ac
View File

@ -1340,7 +1340,7 @@ then
AM_CFLAGS="$CFLAGS"
CFLAGS="$__cflags"
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.24.0)
PKG_CHECK_MODULES(GTK, gtk+-3.0)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)

4
src/app-utils/CMakeLists.txt
View File

@ -79,9 +79,9 @@ SET (app_utils_SOURCES
SET_SOURCE_FILES_PROPERTIES (${app_utils_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
SET(app_utils_ALL_SOURCES ${app_utils_SOURCES} ${app_utils_HEADERS} ${app_utils_noinst_HEADERS})
SET(app_utils_ALL_LIBRARIES gncmod-engine gnc-module ${GTK2_LDFLAGS} ${LIBXML2_LDFLAGS} ${LIBXSLT_LDFLAGS})
SET(app_utils_ALL_LIBRARIES gncmod-engine gnc-module ${GTK3_LDFLAGS} ${LIBXML2_LDFLAGS} ${LIBXSLT_LDFLAGS})
SET(app_utils_ALL_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/calculation ${LIBXML2_INCLUDE_DIRS}
${LIBXSLT_INCLUDE_DIRS} ${GTK2_INCLUDE_DIRS})
${LIBXSLT_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS})
IF (WIN32)
LIST(APPEND app_utils_ALL_SOURCES gnc-help-utils.c)

2
src/backend/dbi/CMakeLists.txt
View File

@ -25,7 +25,7 @@ ADD_LIBRARY (gncmod-backend-dbi
${backend_dbi_noinst_HEADERS}
)
TARGET_LINK_LIBRARIES(gncmod-backend-dbi gnc-backend-sql gncmod-engine gnc-qof ${GTK2_LDFLAGS} ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY})
TARGET_LINK_LIBRARIES(gncmod-backend-dbi gnc-backend-sql gncmod-engine gnc-qof ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY})
TARGET_COMPILE_DEFINITIONS(gncmod-backend-dbi PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.dbi\")

2
src/bin/CMakeLists.txt
View File

@ -25,7 +25,7 @@ TARGET_COMPILE_DEFINITIONS(gnucash PRIVATE -DG_LOG_DOMAIN=\"gnc.bin\")
TARGET_LINK_LIBRARIES (gnucash
gncmod-ledger-core gncmod-report-gnome gnc-gnome gncmod-gnome-utils gncmod-app-utils
gncmod-engine gnc-module gnc-core-utils gnc-qof gncmod-report-system
${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GTK2_LDFLAGS} ${GTK_MAC_LDFLAGS}
${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GTK3_LDFLAGS} ${GTK_MAC_LDFLAGS}
)

4
src/business/business-gnome/CMakeLists.txt
View File

@ -51,7 +51,7 @@ ADD_LIBRARY(gncmod-business-gnome
)
TARGET_LINK_LIBRARIES(gncmod-business-gnome gnc-business-ledger gncmod-gnome-search
gncmod-report-gnome gncmod-gnome-utils gnc-gnome gncmod-engine gnc-qof ${GTK2_LDFLAGS})
gncmod-report-gnome gncmod-gnome-utils gnc-gnome gncmod-engine gnc-qof ${GTK3_LDFLAGS})
TARGET_COMPILE_DEFINITIONS(gncmod-business-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.business.gnome\")
@ -79,4 +79,4 @@ GNC_ADD_SCHEME_TARGETS(scm-business-gnome
"${GUILE_LIBRARY_DIRS}"
"${GUILE_DEPENDS}"
FALSE
)
)

4
src/business/business-ledger/CMakeLists.txt
View File

@ -22,7 +22,7 @@ ADD_LIBRARY (gnc-business-ledger
)
TARGET_LINK_LIBRARIES(gnc-business-ledger gncmod-ledger-core gncmod-register-core gncmod-engine gncmod-gnome-utils
gnc-core-utils ${GTK2_LDFLAGS})
gnc-core-utils ${GTK3_LDFLAGS})
TARGET_COMPILE_DEFINITIONS (gnc-business-ledger PRIVATE -DG_LOG_DOMAIN=\"gnc.business.ledger\")
@ -32,4 +32,4 @@ INSTALL(TARGETS gnc-business-ledger
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
RUNTIME DESTINATION bin)
# No headers to install
# No headers to install

2
src/gnome-search/CMakeLists.txt
View File

@ -42,7 +42,7 @@ ADD_LIBRARY (gncmod-gnome-search
${gnome_search_noinst_HEADERS}
)
TARGET_LINK_LIBRARIES(gncmod-gnome-search gnc-qof gncmod-gnome-utils ${GTK2_LDFLAGS})
TARGET_LINK_LIBRARIES(gncmod-gnome-search gnc-qof gncmod-gnome-utils ${GTK3_LDFLAGS})
TARGET_COMPILE_DEFINITIONS(gncmod-gnome-search PRIVATE -DG_LOG_DOMAIN=\"gnc.gui.search\")

4
src/gnome-utils/CMakeLists.txt
View File

@ -210,7 +210,7 @@ ADD_LIBRARY (gncmod-gnome-utils
)
TARGET_LINK_LIBRARIES(gncmod-gnome-utils gncmod-app-utils gncmod-engine gnc-backend-xml-utils
${GTK2_LDFLAGS} ${GTK_MAC_LDFLAGS})
${GTK3_LDFLAGS} ${GTK_MAC_LDFLAGS})
TARGET_COMPILE_DEFINITIONS(gncmod-gnome-utils PUBLIC ${GTK_MAC_CFLAGS_OTHER}
PRIVATE -DG_LOG_DOMAIN=\"gnc.gui\")
@ -222,7 +222,7 @@ ENDIF(MAC_INTEGRATION)
TARGET_INCLUDE_DIRECTORIES(gncmod-gnome-utils
PUBLIC
${GTK2_INCLUDE_DIRS}
${GTK3_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}
PRIVATE
${GTK_MAC_INCLUDE_DIRS}

2
src/gnome-utils/test/CMakeLists.txt
View File

@ -17,7 +17,7 @@ SET(GNOME_UTILS_GUI_TEST_INCLUDE_DIRS
${CMAKE_SOURCE_DIR}/src/gnome-utils
${CMAKE_SOURCE_DIR}/src/engine
${CMAKE_SOURCE_DIR}/src/libqof/qof # for qof.h
${GTK2_INCLUDE_DIRS}
${GTK3_INCLUDE_DIRS}
)
SET(GNOME_UTILS_GUI_TEST_LIBS
${GNOME_UTILS_TEST_LIBS}

2
src/gnome/CMakeLists.txt
View File

@ -100,7 +100,7 @@ ENDIF(WIN32)
ADD_LIBRARY (gnc-gnome ${gnc_gnome_SOURCES} ${gnc_gnome_noinst_HEADERS})
TARGET_LINK_LIBRARIES(gnc-gnome gncmod-gnome-search gncmod-ledger-core gncmod-report-gnome gncmod-report-system
gncmod-register-gnome gncmod-register-core gncmod-engine ${GTK2_LDFLAGS} ${GTK_MAC_LDFLAGS})
gncmod-register-gnome gncmod-register-core gncmod-engine ${GTK3_LDFLAGS} ${GTK_MAC_LDFLAGS})
TARGET_COMPILE_DEFINITIONS (gnc-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.gui\" ${GTK_MAC_CFLAGS_OTHER})

2
src/import-export/CMakeLists.txt
View File

@ -53,7 +53,7 @@ ADD_LIBRARY (gncmod-generic-import
${generic_import_noinst_HEADERS}
)
TARGET_LINK_LIBRARIES(gncmod-generic-import gncmod-gnome-utils gncmod-engine ${GTK2_LDFLAGS} ${GLIB2_LDFLAGS})
TARGET_LINK_LIBRARIES(gncmod-generic-import gncmod-gnome-utils gncmod-engine ${GTK3_LDFLAGS} ${GLIB2_LDFLAGS})
TARGET_COMPILE_DEFINITIONS (gncmod-generic-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import\")

4
src/import-export/log-replay/CMakeLists.txt
View File

@ -16,7 +16,7 @@ SET(log_replay_noinst_HEADERS
ADD_LIBRARY(gncmod-log-replay ${log_replay_SOURCES} ${log_replay_noinst_HEADERS})
TARGET_LINK_LIBRARIES(gncmod-log-replay gncmod-gnome-utils gncmod-app-utils gncmod-engine
gnc-core-utils gnc-module gnc-qof ${GTK2_LDFLAGS})
gnc-core-utils gnc-module gnc-qof ${GTK3_LDFLAGS})
TARGET_COMPILE_DEFINITIONS(gncmod-log-replay PRIVATE -DG_LOG_DOMAIN=\"gnc.import.log-replay\")
@ -33,4 +33,4 @@ INSTALL(FILES ${log_replay_UI} DESTINATION share/gnucash/ui)
IF (GNC_BUILD_AS_INSTALL)
FILE(COPY ${log_replay_UI}
DESTINATION ${DATADIR_BUILD}/gnucash/ui)
ENDIF()
ENDIF()

2
src/register/ledger-core/CMakeLists.txt
View File

@ -31,7 +31,7 @@ SET_SOURCE_FILES_PROPERTIES (${ledger_core_SOURCES} PROPERTIES OBJECT_DEPENDS ${
ADD_LIBRARY (gncmod-ledger-core ${ledger_core_SOURCES} ${ledger_core_HEADERS})
TARGET_LINK_LIBRARIES(gncmod-ledger-core gncmod-register-gnome gncmod-register-core gncmod-gnome-utils
gncmod-engine ${GTK2_LDFLAGS})
gncmod-engine ${GTK3_LDFLAGS})
TARGET_COMPILE_DEFINITIONS (gncmod-ledger-core PRIVATE -DG_LOG_DOMAIN=\"gnc.register.ledger\")

4
src/register/register-gnome/CMakeLists.txt
View File

@ -44,13 +44,13 @@ SET_SOURCE_FILES_PROPERTIES (${register_gnome_SOURCES} PROPERTIES OBJECT_DEPENDS
ADD_LIBRARY (gncmod-register-gnome ${register_gnome_SOURCES} ${register_gnome_noinst_HEADERS})
TARGET_LINK_LIBRARIES(gncmod-register-gnome gncmod-register-core gnc-qof ${GTK2_LDFLAGS})
TARGET_LINK_LIBRARIES(gncmod-register-gnome gncmod-register-core gnc-qof ${GTK3_LDFLAGS})
TARGET_COMPILE_DEFINITIONS(gncmod-register-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.register.gnome\")
TARGET_INCLUDE_DIRECTORIES(gncmod-register-gnome
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
PRIVATE ${CMAKE_SOURCE_DIR}/src/register/ledger-core ${GTK2_INCLUDE_DIRS}
PRIVATE ${CMAKE_SOURCE_DIR}/src/register/ledger-core ${GTK3_INCLUDE_DIRS}
)
INSTALL(TARGETS gncmod-register-gnome

2
src/report/report-gnome/CMakeLists.txt
View File

@ -30,7 +30,7 @@ ADD_LIBRARY (gncmod-report-gnome
${report_gnome_HEADERS}
)
TARGET_LINK_LIBRARIES(gncmod-report-gnome gncmod-report-system gncmod-html gncmod-gnome-utils
gnc-qof ${GUILE_LDFLAGS} ${GTK2_LDFLAGS})
gnc-qof ${GUILE_LDFLAGS} ${GTK3_LDFLAGS})
TARGET_COMPILE_DEFINITIONS (gncmod-report-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.report.gui\")

4
src/report/report-system/CMakeLists.txt
View File

@ -25,10 +25,10 @@ ADD_LIBRARY (gncmod-report-system
TARGET_COMPILE_DEFINITIONS(gncmod-report-system PRIVATE -DG_LOG_DOMAIN=\"gnc.report.core\")
TARGET_LINK_LIBRARIES(gncmod-report-system gnc-module gncmod-app-utils gnc-qof ${GTK2_LDFLAGS} ${GUILE_LDFLAGS})
TARGET_LINK_LIBRARIES(gncmod-report-system gnc-module gncmod-app-utils gnc-qof ${GTK3_LDFLAGS} ${GUILE_LDFLAGS})
TARGET_INCLUDE_DIRECTORIES (gncmod-report-system
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE ${GTK2_INCLUDE_DIRS}
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE ${GTK3_INCLUDE_DIRS}
)

2
src/report/standard-reports/CMakeLists.txt
View File

@ -5,7 +5,7 @@ SET(standard_reports_SOURCES gncmod-standard-reports.c)
ADD_LIBRARY (gncmod-standard-reports ${standard_reports_SOURCES})
TARGET_LINK_LIBRARIES(gncmod-standard-reports gnc-module ${GTK2_LDFLAGS})
TARGET_LINK_LIBRARIES(gncmod-standard-reports gnc-module ${GTK3_LDFLAGS})
TARGET_COMPILE_DEFINITIONS(gncmod-standard-reports PRIVATE -DG_LOG_DOMAIN=\"gnc.report.standard\")

2
src/report/stylesheets/CMakeLists.txt
View File

@ -12,7 +12,7 @@ SET(stylesheet_noinst_HEADERS
ADD_LIBRARY(gncmod-stylesheets MODULE ${stylesheets_SOURCES} ${stylesheets_noinst_HEADERS})
TARGET_LINK_LIBRARIES(gncmod-stylesheets gncmod-report-gnome gncmod-report-system gncmod-gnome-utils gnc-module
gnc-qof ${GUILE_LDFLAGS} ${GTK2_LDFLAGS} ${GLIB2_LDFLAGS})
gnc-qof ${GUILE_LDFLAGS} ${GTK3_LDFLAGS} ${GLIB2_LDFLAGS})
TARGET_COMPILE_DEFINITIONS(gncmod-stylesheets PRIVATE -DG_LOG_DOMAIN=\"gnc.report.core\")