gnucash master: Multiple changes pushed

Christian Stimming cstim at code.gnucash.org
Fri Aug 29 16:00:21 EDT 2014


Updated	 via  https://github.com/Gnucash/gnucash/commit/0871df56 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/c37fa6f8 (commit)
	from  https://github.com/Gnucash/gnucash/commit/b69fe381 (commit)



commit 0871df5628978fd7920176e2da90153ea7d64152
Author: Christian Stimming <christian at cstimming.de>
Date:   Fri Aug 29 21:55:32 2014 +0200

    Gtkmm wrappers: Adapt to setting qof_instance_set_dirty as private functions.

diff --git a/src/optional/gtkmm/gncmm/GncInstance.cpp b/src/optional/gtkmm/gncmm/GncInstance.cpp
index 332b076..498e194 100644
--- a/src/optional/gtkmm/gncmm/GncInstance.cpp
+++ b/src/optional/gtkmm/gncmm/GncInstance.cpp
@@ -23,6 +23,7 @@
 #include "GncInstance.hpp"
 #include "private/GncInstance_p.hpp"
 #include "Book.hpp"
+#include "qofinstance-p.h"
 
 
 namespace Glib
@@ -114,6 +115,16 @@ GType GncInstance::get_base_type()
     return qof_instance_get_type();
 }
 
+void GncInstance::set_dirty()
+{
+    return qof_instance_set_dirty(gobj());
+}
+void GncInstance::mark_clean()
+{
+    return qof_instance_mark_clean(gobj());
+}
+
+
 // ////////////////////////////////////////
 
 Glib::RefPtr<Book> GncInstance::get_book() const
diff --git a/src/optional/gtkmm/gncmm/GncInstance.hpp b/src/optional/gtkmm/gncmm/GncInstance.hpp
index 5e0ccbb..2bdc28d 100644
--- a/src/optional/gtkmm/gncmm/GncInstance.hpp
+++ b/src/optional/gtkmm/gncmm/GncInstance.hpp
@@ -108,14 +108,8 @@ public:
     {
         return qof_instance_get_dirty(gobj_const());
     }
-    void set_dirty()
-    {
-        return qof_instance_set_dirty(gobj());
-    }
-    void mark_clean()
-    {
-        return qof_instance_mark_clean(gobj());
-    }
+    void set_dirty();
+    void mark_clean();
 
     //bool check_type(const char* type_id) { return (0 == g_strcmp0(type_id, QOF_INSTANCE(base_class::get())->e_type)); }
     //Slots getSlots() const { return qof_instance_get_slots(QOF_INSTANCE(get())); }

commit c37fa6f8b0f2c3fe926beed39dcbed18d5651724
Author: Christian Stimming <christian at cstimming.de>
Date:   Fri Aug 29 21:55:12 2014 +0200

    CMake: Update build system to build again.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64d8098..d7034e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,16 +96,22 @@ ENDIF (NOT GUILE_EXECUTABLE)
 SET (Boost_USE_STATIC_LIBS OFF)
 SET (Boost_USE_MULTITHREADED ON)
 SET (Boost_USE_STATIC_RUNTIME OFF)
-FIND_PACKAGE (Boost 1.50.0 REQUIRED COMPONENTS chrono date-time filesystem log program_options regex signals system test)
+SET (Boost_FIND_QUIETLY ON)
+FIND_PACKAGE (Boost 1.50.0 REQUIRED COMPONENTS chrono date_time filesystem log program_options regex signals system) # test)
+# boost-test currently can't be found by FindBoost.cmake because the
+# shared library might be named libboost_unit_test_framework.so
 
 IF (Boost_FOUND)
     include_directories(${Boost_INCLUDE_DIRS})
-    add_executable(progname file1.cxx file2.cxx)
-    target_link_libraries(progname ${Boost_LIBRARIES})
+#    add_executable(progname file1.cxx file2.cxx)
+#    target_link_libraries(progname ${Boost_LIBRARIES})
 ELSE (Boost_FOUND)
-    MESSAGE (SEND_ERROR "Boost 1.50.0 or later is not installed, and is required. Please install it and ensure that the following libraries are built: chrono, date-time, filesystem, log, program_options, regex, signals, system, and test.")
+    MESSAGE (SEND_ERROR "Boost 1.50.0 or later is not installed, and is required. Please install it and ensure that the following libraries are built: chrono, date_time, filesystem, log, program_options, regex, signals, system, and test.")
 ENDIF (Boost_FOUND)
 
+# Also, set the C++ version to c++11
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+
 # ############################################################
 
 # libdbi
diff --git a/src/import-export/CMakeLists.txt b/src/import-export/CMakeLists.txt
index 5f93071..0a21959 100644
--- a/src/import-export/CMakeLists.txt
+++ b/src/import-export/CMakeLists.txt
@@ -24,7 +24,6 @@ INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/app-utils)
 SET (libgnc_import_SOURCES
   import-utilities.c
   import-settings.c
-  import-match-map.c
 )
 
 # Add dependency on config.h
@@ -33,7 +32,6 @@ SET_SOURCE_FILES_PROPERTIES (${libgnc_import_SOURCES} PROPERTIES OBJECT_DEPENDS
 SET (libgnc_import_HEADERS
   import-utilities.h
   import-settings.h
-  import-match-map.h
 )
 
 ADD_LIBRARY (gnc-import
diff --git a/src/libqof/CMakeLists.txt b/src/libqof/CMakeLists.txt
index 9ae8f7d..9b81bed 100644
--- a/src/libqof/CMakeLists.txt
+++ b/src/libqof/CMakeLists.txt
@@ -15,7 +15,6 @@ SET (libgnc_qof_SOURCES
    qof/guid.cpp
    qof/kvp-util.cpp
    qof/kvp_frame.cpp
-   qof/md5.c
    qof/qofbackend.cpp
    qof/qofbook.cpp
    qof/qofchoice.cpp



Summary of changes:
 CMakeLists.txt                           | 14 ++++++++++----
 src/import-export/CMakeLists.txt         |  2 --
 src/libqof/CMakeLists.txt                |  1 -
 src/optional/gtkmm/gncmm/GncInstance.cpp | 11 +++++++++++
 src/optional/gtkmm/gncmm/GncInstance.hpp | 10 ++--------
 5 files changed, 23 insertions(+), 15 deletions(-)



More information about the gnucash-changes mailing list