Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 10814 → Rev 10815

/trunk/Scribus/cmake/modules/FindZLIB.cmake
File deleted
/trunk/Scribus/cmake/modules/FindPNG.cmake
File deleted
/trunk/Scribus/cmake/modules/FindJPEG.cmake
File deleted
/trunk/Scribus/cmake/modules/FREETYPEConfig.cmake
37,34 → 37,18
)
ENDIF (BUILD_OSX_BUNDLE)
 
SET(FREETYPE_LIBRARY_NAMES_DEBUG ${FREETYPE_LIBRARY_NAMES_DEBUG} freetyped)
SET(FREETYPE_LIBRARY_NAMES_RELEASE ${FREETYPE_LIBRARY_NAMES_RELEASE} freetype)
 
IF(BUILD_OSX_BUNDLE)
SET(FREETYPE_LIB_PATHS /opt/local/lib)
FIND_LIBRARY(FREETYPE_LIBRARY freetype ${FREETYPE_LIBRARY_NAMES}
PATHS /opt/local/lib
NO_CMAKE_SYSTEM_PATH
)
ELSE(BUILD_OSX_BUNDLE)
SET(FREETYPE_LIB_PATHS /usr/lib /usr/local/lib)
FIND_LIBRARY(FREETYPE_LIBRARY freetype ${FREETYPE_LIBRARY_NAMES}
PATHS /usr/lib /usr/local/lib
NO_CMAKE_SYSTEM_PATH
)
ENDIF(BUILD_OSX_BUNDLE)
 
FIND_LIBRARY(FREETYPE_LIBRARY_RELEASE ${FREETYPE_LIBRARY_NAMES_RELEASE} ${FREETYPE_LIBRARY_NAMES}
PATHS
${FREETYPE_LIB_PATHS}
NO_CMAKE_SYSTEM_PATH)
FIND_LIBRARY(FREETYPE_LIBRARY_DEBUG ${FREETYPE_LIBRARY_NAMES_DEBUG}
PATHS
${FREETYPE_LIB_PATHS}
NO_CMAKE_SYSTEM_PATH)
 
IF(FREETYPE_LIBRARY_RELEASE AND LCMS_LIBRARY_DEBUG)
SET(FREETYPE_LIBRARY "optimized;${FREETYPE_LIBRARY_RELEASE};debug;${FREETYPE_LIBRARY_DEBUG}")
ELSE(FREETYPE_LIBRARY_RELEASE AND LCMS_LIBRARY_DEBUG)
IF(FREETYPE_LIBRARY_DEBUG)
SET(FREETYPE_LIBRARY ${FREETYPE_LIBRARY_DEBUG})
ELSE(FREETYPE_LIBRARY_DEBUG)
SET(FREETYPE_LIBRARY ${FREETYPE_LIBRARY_RELEASE})
ENDIF(FREETYPE_LIBRARY_DEBUG)
ENDIF(FREETYPE_LIBRARY_RELEASE AND LCMS_LIBRARY_DEBUG)
 
# MESSAGE(STATUS "ft lib ${FREETYPE_LIBRARY}")
# MESSAGE(STATUS "ft2 build ${FREETYPE_INCLUDE_DIR_FT2BUILD}")
# MESSAGE(STATUS "ft header ${FREETYPE_INCLUDE_DIR_FTHEADER}")
/trunk/Scribus/cmake/modules/FindTIFF.cmake
File deleted
/trunk/Scribus/cmake/modules/FindLCMS.cmake
23,30 → 23,11
/usr/local/include
)
 
FIND_LIBRARY(LCMS_LIBRARY_RELEASE
NAMES ${LCMS_NAMES_RELEASE} ${LCMS_NAMES} lcms liblcms lcmsdll
FIND_LIBRARY(LCMS_LIBRARY
NAMES lcms liblcms lcmsdll
PATHS /usr/lib /usr/local/lib
)
 
FIND_LIBRARY(LCMS_LIBRARY_DEBUG
NAMES ${LCMS_NAMES_DEBUG} lcmsd liblcmsd lcmsdlld
PATHS /usr/lib /usr/local/lib
)
 
IF(LCMS_LIBRARY_RELEASE AND LCMS_LIBRARY_DEBUG)
SET(LCMS_LIBRARY "optimized;${LCMS_LIBRARY_RELEASE};debug;${LCMS_LIBRARY_DEBUG}")
ELSE(LCMS_LIBRARY_RELEASE AND LCMS_LIBRARY_DEBUG)
IF(LCMS_LIBRARY_DEBUG)
SET(LCMS_LIBRARY ${LCMS_LIBRARY_DEBUG})
ELSE(LCMS_LIBRARY_DEBUG)
SET(LCMS_LIBRARY ${LCMS_LIBRARY_RELEASE})
ENDIF(LCMS_LIBRARY_DEBUG)
ENDIF(LCMS_LIBRARY_RELEASE AND LCMS_LIBRARY_DEBUG)
 
MESSAGE("LCMS ReleaseLibrary: ${LCMS_LIBRARY_RELEASE}")
MESSAGE("LCMS Debug Library: ${LCMS_LIBRARY_DEBUG}")
MESSAGE("LCMS Library: ${LCMS_LIBRARY}")
 
IF (LCMS_LIBRARY AND LCMS_INCLUDE_DIR)
SET( LCMS_FOUND 1 )
SET( LCMS_LIBRARIES ${LCMS_LIBRARY} )