Skip to content
Snippets Groups Projects
Commit b406328d authored by Pere Mato Vila's avatar Pere Mato Vila
Browse files

Merge branch '130'

* 130:
  Minor changes to complete the running of tests with option 'gnuinstall'.
  Let TASImage::DrawText resolve the font paths
  Resolve font paths in TASImage::DrawText
  Better python
  Fix TString / std:string conversion
  Add backward compatible GetTutorialsDir that returns const char*
  Rename GetTutorialsDir to GetTutorialDir
  Adapt new changes to the test-install fix
  Fix paths
  Initialize directory functions
  Remove #ifdefs for IOS etcdir
  Remove unused #define
  Add/Remove .Data()
  Avoid using temporaries
  Make it possible to run tests when configuring with -Dgnuinstall:BOOL=ON
  gnuinstall should not imply rpath
  Copy python files to lib, not ${CMAKE_INSTALL_LIBDIR}
  Copy headers to include, not ${CMAKE_INSTALL_INCLUDEDIR}
parents 318c7a47 b508dcff
No related branches found
No related tags found
No related merge requests found
Showing
with 381 additions and 310 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment