From 249527c985a9580a5a17ceab8f4488b855a8569c Mon Sep 17 00:00:00 2001 From: "Tim D. Smith" Date: Sat, 9 May 2015 20:01:32 -0700 Subject: link ledger executable to Python Since the ledger executable embeds the Python interpreter, it does need an explicit link to a Python framework on OS X after all. --- src/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a368d378..570a6592 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -273,6 +273,9 @@ if (BUILD_LIBRARY) add_executable(ledger main.cc global.cc) target_link_libraries(ledger libledger) + if (APPLE AND HAVE_BOOST_PYTHON) + target_link_libraries(ledger ${PYTHON_LIBRARIES}) + endif() install(TARGETS libledger DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES ${LEDGER_INCLUDES} -- cgit v1.2.3 From d0fba947ade223dfa351c49ac15c6939c35b5f89 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 28 Jul 2015 20:55:56 +0200 Subject: [cmake] Use CMAKE_SYSTEM_NAME to test the platform. APPLE and CMAKE_HOST_APPLE only check the host system, whereas CMAKE_SYSTEM_NAME checks the target system when cross-compiling. --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 6166780c..3c8c36ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -225,7 +225,7 @@ macro(add_ledger_library_dependencies _target) target_link_libraries(${_target} ${INTL_LIB}) endif() if (HAVE_BOOST_PYTHON) - if(APPLE) + if(CMAKE_SYSTEM_NAME STREQUAL Darwin) # Don't link directly to a Python framework on OS X, to avoid segfaults # when the module is imported from a different interpreter target_link_libraries(${_target} ${Boost_LIBRARIES}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 570a6592..8ed6e51a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -273,7 +273,7 @@ if (BUILD_LIBRARY) add_executable(ledger main.cc global.cc) target_link_libraries(ledger libledger) - if (APPLE AND HAVE_BOOST_PYTHON) + if (CMAKE_SYSTEM_NAME STREQUAL Darwin AND HAVE_BOOST_PYTHON) target_link_libraries(ledger ${PYTHON_LIBRARIES}) endif() @@ -297,7 +297,7 @@ print(s.get_python_lib(True, prefix=''))" if (PYTHON_SITE_PACKAGES) if (WIN32 AND NOT CYGWIN) set(_ledger_python_module_name "ledger.pyd") - elseif(CMAKE_HOST_APPLE) + elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin) set(_ledger_python_module_name "ledger.so") else() set(_ledger_python_module_name "ledger${CMAKE_SHARED_LIBRARY_SUFFIX}") -- cgit v1.2.3 From a24910b3740b572db15fda4bd574222090e16d79 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 4 Aug 2015 14:47:44 -0700 Subject: Whitespace cleanup --- src/CMakeLists.txt | 8 ++++---- src/filters.cc | 6 +++--- src/filters.h | 2 +- src/history.cc | 2 +- src/pool.h | 4 ++-- src/pyinterp.h | 2 +- src/select.cc | 2 +- src/strptime.cc | 2 +- src/value.h | 2 +- src/views.h | 2 +- src/wcwidth.cc | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8ed6e51a..65e58edb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -152,7 +152,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug") -Wno-unused-parameter -Wno-c++98-compat -fno-limit-debug-info) - + macro(ADD_PCH_RULE _header_filename _src_list _other_srcs) set(_pch_filename "${_header_filename}.pch") @@ -188,7 +188,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug") COMMAND ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} ${_args} DEPENDS ${_header_filename}) endmacro(ADD_PCH_RULE _header_filename _src_list _other_srcs) - + elseif(CMAKE_CXX_COMPILER MATCHES "g\\+\\+") set(GXX_WARNING_FLAGS -pedantic @@ -210,7 +210,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug") -Wno-strict-aliasing) add_definitions(${GXX_WARNING_FLAGS}) - + macro(ADD_PCH_RULE _header_filename _src_list _other_srcs) set(_gch_filename "${_header_filename}.gch") @@ -247,7 +247,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug") COMMAND ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} ${_args} DEPENDS ${_header_filename}) endmacro(ADD_PCH_RULE _header_filename _src_list _other_srcs) - + else() macro(ADD_PCH_RULE _header_filename _src_list _other_srcs) endmacro(ADD_PCH_RULE _header_filename _src_list _other_srcs) diff --git a/src/filters.cc b/src/filters.cc index d9fb64b0..ef713f1f 100644 --- a/src/filters.cc +++ b/src/filters.cc @@ -448,7 +448,7 @@ void collapse_posts::report_subtotal() DEBUG("filters.collapse", "Pseudo-xact date = " << *xact._date); DEBUG("filters.collapse", "earliest date = " << earliest_date); DEBUG("filters.collapse", "latest date = " << latest_date); - + foreach (totals_map::value_type& pat, totals) { handle_value(/* value= */ pat.second, /* account= */ &temps.create_account(pat.first), @@ -476,10 +476,10 @@ value_t& collapse_posts::find_totals(account_t* account) if(depth==0) return totals[_("")]; - + if(account->depth==depth) return totals[account->fullname()]; - + //else recurse return find_totals(account->parent); } diff --git a/src/filters.h b/src/filters.h index 9b745235..e3dc19d8 100644 --- a/src/filters.h +++ b/src/filters.h @@ -423,7 +423,7 @@ class collapse_posts : public item_handler { typedef std::map totals_map; - + expr_t& amount_expr; predicate_t display_predicate; predicate_t only_predicate; diff --git a/src/history.cc b/src/history.cc index e3c459f3..8772d18c 100644 --- a/src/history.cc +++ b/src/history.cc @@ -475,7 +475,7 @@ commodity_history_impl_t::find_price(const commodity_t& source, #endif vertex_descriptor v = tv; - for (vertex_descriptor u = predecessorMap[v]; + for (vertex_descriptor u = predecessorMap[v]; u != v; v = u, u = predecessorMap[v]) { diff --git a/src/pool.h b/src/pool.h index 2e9d93f1..fcc54b86 100644 --- a/src/pool.h +++ b/src/pool.h @@ -78,8 +78,8 @@ public: commodity_t * default_commodity; bool keep_base; // --base - optional price_db; // --price-db= - long quote_leeway; // --leeway= + optional price_db; // --price-db= + long quote_leeway; // --leeway= bool get_quotes; // --download function diff --git a/src/pyinterp.h b/src/pyinterp.h index 32becbf6..fe86573a 100644 --- a/src/pyinterp.h +++ b/src/pyinterp.h @@ -77,7 +77,7 @@ public: if (name != "__main__") main_module->define_global(name, mod->module_object); return mod; - } + } python_interpreter_t() : session_t(), is_initialized(false) { TRACE_CTOR(python_interpreter_t, ""); diff --git a/src/select.cc b/src/select.cc index 81800f16..1141df04 100644 --- a/src/select.cc +++ b/src/select.cc @@ -396,7 +396,7 @@ value_t select_command(call_scope_t& args) #if 0 query_t query; keep_details_t keeper(true, true, true); - expr_t::ptr_op_t expr = + expr_t::ptr_op_t expr = query.parse_args(string_value(arg).to_sequence(), keeper, false, true); report.HANDLER(limit_).on("#select", query.get_query(query_t::QUERY_LIMIT)); #else diff --git a/src/strptime.cc b/src/strptime.cc index b64af96b..b31954f4 100644 --- a/src/strptime.cc +++ b/src/strptime.cc @@ -85,7 +85,7 @@ static char* _strptime(const char *s, const char *format, struct tm *tm) { if (tm->tm_wday == -1) return NULL; s += len; break; - + // month name. case 'b': case 'B': diff --git a/src/value.h b/src/value.h index 810d34f9..c9084e03 100644 --- a/src/value.h +++ b/src/value.h @@ -435,7 +435,7 @@ public: return temp; } void in_place_roundto(int places); - + value_t truncated() const { value_t temp(*this); temp.in_place_truncate(); diff --git a/src/views.h b/src/views.h index 2be3d978..603b28da 100644 --- a/src/views.h +++ b/src/views.h @@ -235,7 +235,7 @@ public: optional note() const { return ptr()->note; } - + bool has_tag(const string& tag) const { return ptr()->has_tag(tag); } diff --git a/src/wcwidth.cc b/src/wcwidth.cc index c23f83d7..75cd76be 100644 --- a/src/wcwidth.cc +++ b/src/wcwidth.cc @@ -195,7 +195,7 @@ int mk_wcwidth(boost::uint32_t ucs) /* if we arrive here, ucs is not a combining or C0/C1 control character */ - return 1 + + return 1 + (ucs >= 0x1100 && (ucs <= 0x115f || /* Hangul Jamo init. consonants */ ucs == 0x2329 || ucs == 0x232a || -- cgit v1.2.3