Subversion Repositories Scribus

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
10818 5097d 12h craig /trunk/Scribus/cmake/modules/ScribusFindPackageHandleStandardArgs.cmake Retry of 10817 with a bit of work to make it CMake 2.4 compatible.

More win32+cmake updates:
- Backport the FIND_PACKAGE_HANDLE_STANDARD_ARGS macro from CMake 2.5.
2.5 users see the stock CMake macro, but 2.4 users get our copy. This
permits more CMake 2.5 Find...cmake scripts to be used.
- Provide a new macro, LIBRARY_DEBUG_AND_RELEASE, that sets blah_LIBRARY
based on which of blah_LIBRARY_DEBUG and blah_LIBRARY_RELEASE are set.
On most platforms blah_LIBRARY_DEBUG will be unset so this'll just
set the blah_LIBRARY to blah_LIBRARY_RELEASE (matching the old behaviour).
- Where available, find and link to debug versions of required libraries
automatically when doing a debug build by finding debug and release versions
separately then using LIBRARY_DEBUG_AND_RELEASE .
- Ensure all used CMake Find scripts can use a library names variable
to specify alternate names libs may have (eg ZLIB_NAMES).
- On windows, permit use of the zlib and libpng libraries statically linked
into qtcore.dll rather than standalone versions (see build instructions)
- Updates to build script in win32 build instructions
 
/trunk/Scribus/cmake/modules/FindJPEG.cmake
/trunk/Scribus/cmake/modules/FindPNG.cmake
/trunk/Scribus/cmake/modules/FindTIFF.cmake
/trunk/Scribus/cmake/modules/FindZLIB.cmake
/trunk/Scribus/cmake/modules/LibraryDebugAndRelease.cmake
/trunk/Scribus/cmake/modules/ScribusFindPackageHandleStandardArgs.cmake
/trunk/Scribus/BUILDING_win32.txt
/trunk/Scribus/CMakeLists.txt
/trunk/Scribus/cmake/modules/FREETYPEConfig.cmake
/trunk/Scribus/cmake/modules/FindLCMS.cmake