Commit Graph

237 Commits

Author SHA1 Message Date
Geert Janssens
a7f1f9cdd7 Fix build with cmake > 3.5 2017-07-09 12:45:01 +02:00
John Ralls
a6678e6a49 Allow compilation with either Webkit2Gtk-4.0 or WebKit2Gtk-3.0.
WEBKIT1 for windows is a placeholder, it will need a pkgconfig check too.
2017-07-08 15:08:07 -07:00
Geert Janssens
5405cf480c Merge branch 'gtk3' 2017-07-08 17:49:44 +02:00
John Ralls
c8402ad62e Merge CMake Distcheck from 'maint'.
Conflicts:
	CMakeLists.txt
	src/app-utils/CMakeLists.txt
	src/backend/sql/test/CMakeLists.txt
	src/backend/xml/test/CMakeLists.txt
	src/gnome-utils/CMakeLists.txt
	src/import-export/aqb/CMakeLists.txt
	src/import-export/csv-imp/CMakeLists.txt
	src/import-export/csv-imp/test/Makefile.am
	src/import-export/ofx/CMakeLists.txt
	src/import-export/qif-imp/CMakeLists.txt
	src/libqof/CMakeLists.txt
	src/register/ledger-core/CMakeLists.txt
	src/register/register-core/CMakeLists.txt
	src/register/register-gnome/CMakeLists.txt
	src/report/business-reports/CMakeLists.txt
	src/report/locale-specific/us/CMakeLists.txt
	src/report/report-gnome/CMakeLists.txt
	src/report/standard-reports/CMakeLists.txt
	src/report/stylesheets/CMakeLists.txt
2017-07-04 18:36:35 -07:00
Rob Gowin
6b14dc5b59 Implement 'dist', 'distcheck' and 'uninstall' targets for CMake 2017-07-03 16:15:17 -07:00
John Ralls
bb2ee92961 Re-release 2.6.17
This time with the version number in CMakeLists.txt updated too.
2017-07-01 17:10:09 -07:00
John Ralls
4b73bb5c50 Merge branch 'maint' 2017-06-20 10:26:47 -07:00
John Ralls
582edc1b31 CMakeLists.txt: Remove Apple architecture settings.
Those should be passed in as part of CFLAGS/CXXFLAGS.
2017-04-29 17:53:10 -07:00
John Ralls
b2b32e29fa Work around googletest bug 920.
https://github.com/google/googletest/issues/920, already addressed in configure.ac.
2017-04-17 11:52:44 -07:00
John Ralls
81fa7d76c4 Adjust CMAKE_C_FLAGS for better release/debug behavior. 2017-04-15 10:26:52 -05:00
John Ralls
bb0376240d Get WebKit2Gtk basics compiling and working.
Copy and register links don't work.
2017-04-14 19:21:35 +02:00
Geert Janssens
e40acf5915 Temporarily disable deprecation warnings 2017-04-14 19:21:34 +02:00
Geert Janssens
2528bfde6b Switch to building with the gtk+-3.0 toolkit 2017-03-31 14:04:31 +02:00
Geert Janssens
4888d34554 Replace all other uses of GnomeCanvas with standard gtk widgets
Most are converted to GtkLayout/GtkiDrawingArea widgets as these
most closely approach the GnomeCanvas concept.

This currently builds and runs but has the following issues still:
- item edit isn't drawn properly (margin and offset issues)
- cursor is not handled properly yet

These will be handled in subsequent commits.
2017-03-31 14:03:49 +02:00
John Ralls
509ce16add Release 2.6.16 2017-03-25 17:23:18 -07:00
Geert Janssens
8acbc41c61 Raise minimum required version of glib-2.0 to 2.40
At the same time require --std=gnu11 instead of --sdt=gnu99.

This allows us to drop some conditionals is several places. I've
chosen 2.4 as that is the version available in travis, which appears to
be the oldest platform care about. Debian stable has 2.46 in backports,
our windows environment has 2.42
2017-03-16 22:51:52 +01:00
John Ralls
744fc29680 Require ICU.
Note that Boost::regex and Boost::locale must also be built with ICU
support.
2017-03-13 11:56:33 -07:00
Geert Janssens
dcce2d79cd Remove final dependencies on GOFFICE
This was still pulled in via the now removed gnc-csv-model.
In order to remove this, the fixed format csv importer
has been tweaked to get the required features from
the c++ csv importer code instead.
2017-02-20 17:54:09 +01:00
Geert Janssens
ed7b863d8f Introduce base class for parsing importable files
This base class takes care of the common things like
file opening and character set conversion.
The actual interpretation of the contents will be
delegated to specialized child classes.

Effective c++ note: explicitly declare special member functions
2017-02-20 17:41:34 +01:00
Geert Janssens
659c96eb1b Optionally locate boost via environment variable BOOST_ROOT
This was already the case for our autotools based build
and simplifies the build setup for our Windows build system.
2017-02-02 18:48:15 +01:00
Geert Janssens
4fdacb9b2a Fix building gtest library on mingw
See https://github.com/google/googletest/issues/893
2017-02-02 18:31:54 +01:00
Geert Janssens
0a8d7a2142 Make google test framework a mandatory build dependency
All c++ unit tests will be written with it, and testing
should be possible out of the box.
We could make it optional, but then lots of tests will
be skipped. This creates an illusion of all tests passing
while many are simply not run. This confusion should be
avoided.
This change depends on a second commit for the windows build
in the gnucash-on-windows repository. This commit will be
pushed at the same time.
2017-02-02 17:20:43 +01:00
Geert Janssens
695065a0aa Merge branch 'maint' 2017-01-23 12:03:00 +01:00
klemens
2a97675bee spelling fixes 2017-01-23 11:50:00 +01:00
John Ralls
1ef17e6e16 Release 2.6.15 2016-12-17 11:11:56 -08:00
Geert Janssens
e4bb9b70f8 Merge branch 'maint' 2016-11-24 14:19:50 +01:00
John Ralls
6695ef9585 Bug 769124 - Australian (GMT-10) OFX transactions imported have previous days date.
Fix on Windows, where the test failed to build.
2016-10-20 10:40:18 -07:00
John Ralls
d8711619ce Merge branch 'maint' 2016-09-17 17:09:51 -07:00
John Ralls
84d15a266a Fix version in CMakeLists.txt. 2016-09-17 14:40:59 -07:00
John Ralls
876f57ef4f Australian (GMT-10) OFX transactions imported have previous days date
The fundamental problem is https://sourceforge.net/p/libofx/bugs/39.
Work around it by detecting it at configure time and if present check
to see if the time in question is not daylight time. If that's the case,
determine the daylight time offset and add it back to the timestamp.
2016-09-11 14:48:24 -07:00
Rob Gowin
78ef933e44 CMake improvements for SWIG handling and Python bindings.
* Add ability to either create SWIG C files or use generated ones
  depending on BUILDING_FROM_VCS.

* Add complete support for compiling Python bindings using
  WITH_PYTHON=YES.

* Add CMakeLists.txt files to a couple more directories.
2016-08-30 18:12:49 -05:00
John Ralls
806be3e1d9 Suppress the console window on launch when building with CMake on MSWin. 2016-08-20 20:14:34 +00:00
John Ralls
992f3232ee Adjust CMAKE_C_FLAGS for better release/debug behavior. 2016-08-09 14:07:36 -07:00
John Ralls
f0d4a9719a Merge branch 'maint' 2016-07-16 13:23:42 -07:00
Rob Gowin
fa8723ea6d Fixes to get CMake "MinGW Makefiles" generator to work.
* CMakeLists.txt: Give CMake a hint about where to find pod2man
     based on where it found perl.

   * src/cmake_modules/GncConfigure.cmake: Protect GNC_HELPDIR in
     quotes for cases where it contains spaces (like "C:\Program Files"
     on Windows).
2016-07-16 14:12:58 -05:00
John Ralls
6252fcf1ae Merge branch 'maint' 2016-07-15 15:18:59 +00:00
Rob Gowin
2c268ba09c Allow HTMLHELP_DIR to be specified on cmake command line 2016-07-14 21:05:32 -05:00
John Ralls
43a7cd096e Merge branch 'maint' 2016-07-08 16:36:10 +00:00
John Ralls
6ad8ff3b4e Tweak version.cmake to work on Windows.
Cmake's execute_process doesn't use a shell unless you tell it to.
2016-07-08 16:35:39 +00:00
John Ralls
344de4eb37 Merge branch 'maint' 2016-07-03 08:53:04 -07:00
John Ralls
6a81738e96 Don't override optimization flags in CMakeLists.txt. 2016-07-02 16:12:56 -07:00
John Ralls
5547337e05 Enable Google Tests under CMake. 2016-07-01 15:01:11 -07:00
John Ralls
ddf84d0725 Release 2.6.13 2016-06-25 12:04:40 -07:00
John Ralls
d3933f7c83 Bump CMake version to current. 2016-06-23 09:41:48 -07:00
Geert Janssens
b92eff265a Avoid variable redefined errors for _FORTIFY_SOURCE
I ran into this on sabayon linux while trying the cmake build
2016-06-02 18:49:23 +02:00
John Ralls
94ca78025e Fix up boost regex linkage issues on non-OSX platforms. 2016-05-21 11:04:12 -07:00
Rob Gowin
c739f4fae4 CMake: Don't try to install COPYING file that does not exist. 2016-04-21 08:36:03 -05:00
Geert Janssens
175d404a1b Merge branch 'maint'
Resolved conflicts:
	src/core-utils/gnc-features.c
	src/core-utils/gnc-features.h
	src/engine/test/CMakeLists.txt
	src/gnc-module/test/test-dynload.c
	src/import-export/import-match-map.c
2016-03-10 15:52:02 +01:00
RobGowin
6e50516c1d cmake - Increase test pass rate on Windows 2016-02-01 18:29:34 +01:00
RobGowin
0031478d86 Fix CMake build after maint merge 2016-01-26 12:13:49 -06:00