lp://staging/~greg-hellings/sword/cmake-work

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~sword-devel/sword/trunk

Dimitri John Ledkov (community): Approve on 2010-12-08

Diff: 39 lines (+6/-19)

1 file modified

CMakeLists.txt (+6/-19)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2539. By Greg Hellings on 2010-12-07

This should fix the problem of CXX not getting the right flags.

2538. By Greg Hellings on 2010-12-07

Modified CMake to accept environment flags (and also prepped for better
building in Windows, when I get back around to that).

2537. By Greg Hellings on 2010-12-07

Cleaned up some CMake problems.

I took out a bunch of extraneous CMake output messages and bound up
several messages into more standardized output formats.

I also eliminated a configure problem where the bindings configure script
would be called even if the user had not selected bindings to be built.
This could cause configure to fail if SWIG was not found when the user did
not wish bindings to be built.

2536. By Greg Hellings on 2010-12-06

Fixing install location of ICU resources.

I moved the install location of the ICU resources of SWORD into a subdir
of the ${libdir} so that the ICU was not directly cluttering up the libdir.
This makes CMake behavior identical to autotools in this regard and fixes
up an issue reported by the packaging team.

2535. By mdbergmann on 2010-11-21

module names are stored as lower case string in SwordManagers module cache. -moduleForName: now als uses a lower case string to pull the module from the cache.

2534. By scribe on 2010-11-06

Slightly optimized returning of search results in jni stub
Fixed progress reporting in cli installmgr

2533. By scribe on 2010-11-06

Added buffer capture feature to ftplib and use this to store directly to an SWBuf instead of a tmp file
Released local references to Java utf8 strings generated in the loop returning search results. This allows GC and keeps from overstepping out 512 object limit in a jni stack

2532. By refdoc on 2010-11-04

added abbreviation for Acts

2531. By scribe on 2010-10-22

Prep for 1.6.2 release

2530. By Greg Hellings on 2010-10-22

Added osis2mod to the list of utilities that CMake can build. Had missed
that one previously.