Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 20014 → Rev 20013

/trunk/Scribus/cmake/modules/cmakeconfigreport.cmake
File deleted
/trunk/Scribus/CMakeLists.txt
3,12 → 3,11
 
#Set our CMake minimum version
#Require 2.8.9 for Qt5
#Require 3.2.0 for add_custom_target with byproducts
CMAKE_MINIMUM_REQUIRED(VERSION 3.2.0 FATAL_ERROR)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9 FATAL_ERROR)
 
#Pretty colors
SET(CMAKE_COLOR_MAKEFILE ON)
#Don't force verbose
#Dont force verbose
SET(CMAKE_VERBOSE_MAKEFILE OFF)
#Include current dir
SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
56,7 → 55,7
IF (VERSION_SUFFIX)
SET (VERSION ${VERSION}.${VERSION_SUFFIX})
ENDIF (VERSION_SUFFIX)
MESSAGE(STATUS "Scribus ${VERSION} will be built and installed into ${CMAKE_INSTALL_PREFIX}")
MESSAGE(STATUS "Scribus ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}")
 
#Set the permissions to be used when installing plugins
SET(PLUGIN_PERMISSIONS WORLD_EXECUTE GROUP_EXECUTE OWNER_EXECUTE WORLD_READ GROUP_READ OWNER_READ OWNER_WRITE)
72,8 → 71,6
OUTPUT_VARIABLE MACHINE
OUTPUT_STRIP_TRAILING_WHITESPACE
)
 
## Find out what machine/cpu we are running on
MESSAGE(STATUS "Machine: ${MACHINE}, void pointer size: ${CMAKE_SIZEOF_VOID_P}")
STRING(REGEX MATCH "(i[0-9]86-*)|(athlon-*)|(pentium-*)" _machine_x86 "${MACHINE}")
IF (_machine_x86)
87,6 → 84,37
SET(ARCH_X86_64 1)
ENDIF (_machine_x86_64)
 
IF (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1))
STRING(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver "${MACHINE}")
IF (_apple_ver EQUAL "14")
MESSAGE(STATUS "Found OSX Yosemite Target: Apple, 64 bit, X86")
SET(APPLE_10_10_X 1 CACHE TYPE BOOL)
ENDIF (_apple_ver EQUAL "14")
IF (_apple_ver EQUAL "13")
MESSAGE(STATUS "Found OSX Mavericks Target: Apple, 64 bit, X86")
SET(APPLE_10_9_X 1 CACHE TYPE BOOL)
ENDIF (_apple_ver EQUAL "13")
IF (_apple_ver EQUAL "12")
MESSAGE(STATUS "Found OSX Mountain Lion Target: Apple, 64 bit, X86")
SET(APPLE_10_8_X 1 CACHE TYPE BOOL)
ENDIF (_apple_ver EQUAL "12")
IF (_apple_ver EQUAL "11")
MESSAGE(STATUS "Found OSX Lion Target: Apple, 64 bit, X86")
SET(APPLE_10_7_X 1 CACHE TYPE BOOL)
ENDIF (_apple_ver EQUAL "11")
IF (_apple_ver EQUAL "10")
MESSAGE(STATUS "Found OSX Snow Leopard Target: Apple, 64 bit, X86")
SET(APPLE_10_6_X 1 CACHE TYPE BOOL)
ENDIF (_apple_ver EQUAL "10")
IF (_apple_ver EQUAL "9")
MESSAGE(STATUS "Found OSX Leopard Target: Apple, 32 bit, X86")
SET(APPLE_10_5_X 1 CACHE TYPE BOOL)
ENDIF (_apple_ver EQUAL "9")
UNSET(ARCH_X86)
ENDIF (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1))
 
 
 
STRING(REGEX MATCH "(sparc64-*)|(SPARC64-*)" _machine_sparc_64 "${MACHINE}")
IF (_machine_sparc_64)
MESSAGE(STATUS "Found target SPARC 64")
130,37 → 158,6
SET(ARCH64BIT 1)
ENDIF (_machine_sparc64)
 
## Do our Apple OSX version setup
IF (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1))
STRING(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver "${MACHINE}")
IF (_apple_ver EQUAL "14")
MESSAGE(STATUS "Found OSX Yosemite Target: Apple, 64 bit, X86")
SET(APPLE_10_10_X 1 CACHE TYPE BOOL)
ENDIF (_apple_ver EQUAL "14")
IF (_apple_ver EQUAL "13")
MESSAGE(STATUS "Found OSX Mavericks Target: Apple, 64 bit, X86")
SET(APPLE_10_9_X 1 CACHE TYPE BOOL)
ENDIF (_apple_ver EQUAL "13")
IF (_apple_ver EQUAL "12")
MESSAGE(STATUS "Found OSX Mountain Lion Target: Apple, 64 bit, X86")
SET(APPLE_10_8_X 1 CACHE TYPE BOOL)
ENDIF (_apple_ver EQUAL "12")
IF (_apple_ver EQUAL "11")
MESSAGE(STATUS "Found OSX Lion Target: Apple, 64 bit, X86")
SET(APPLE_10_7_X 1 CACHE TYPE BOOL)
ENDIF (_apple_ver EQUAL "11")
IF (_apple_ver EQUAL "10")
MESSAGE(STATUS "Found OSX Snow Leopard Target: Apple, 64 bit, X86")
SET(APPLE_10_6_X 1 CACHE TYPE BOOL)
ENDIF (_apple_ver EQUAL "10")
IF (_apple_ver EQUAL "9")
MESSAGE(STATUS "Found OSX Leopard Target: Apple, 32 bit, X86")
SET(APPLE_10_5_X 1 CACHE TYPE BOOL)
ENDIF (_apple_ver EQUAL "9")
UNSET(ARCH_X86)
ENDIF (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1))
 
 
#convert any 64 bit build into generic 64 tag for below
IF (ARCH_X86_64 OR ARCH_SPARC_64 OR ARCH_MIPS_64 OR ARCH_PPC_64)
SET(ARCH64BIT 1)
199,7 → 196,7
ENDIF (WANT_VERSIONING OR CACHED_VERSIONING)
ENDIF (APPLEBUNDLE OR WIN32)
 
#Store our version string if required
#Store our version string if require
IF (WANT_VERSIONING AND NOT CACHED_VERSIONING)
IF (NOT CUSTOM_VERSIONTAG)
SET(TAG_VERSION "-${VERSION}" CACHE TYPE STRING)
224,6 → 221,7
SET(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Scribus${VERSION}.app/Contents")
ENDIF ("${CMAKE_INSTALL_PREFIX}" MATCHES "[.]app/?$")
ENDIF ("${CMAKE_INSTALL_PREFIX}" MATCHES "[.]app/Contents/?$")
 
MESSAGE(STATUS "APPLEBUNDLE install prefix: ${APPLE_APP_DIR}")
ENDIF (APPLEBUNDLE)
 
886,8 → 884,7
)
 
ADD_CUSTOM_TARGET(uninstall
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
)
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 
 
##############################################################################################################
999,4 → 996,3
INCLUDE(CPack)
ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
 
#include (cmakeconfigreport optional)