Projects
Kube:Winterfell
cmake
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 3
View file
cmake-2.8.11-rc4-lua-5.2.patch
Added
@@ -0,0 +1,77 @@ +diff -up cmake-2.8.11-rc4/Modules/FindLua52.cmake.lua-52 cmake-2.8.11-rc4/Modules/FindLua52.cmake +--- cmake-2.8.11-rc4/Modules/FindLua52.cmake.lua-52 2013-05-13 09:41:15.221278404 -0400 ++++ cmake-2.8.11-rc4/Modules/FindLua52.cmake 2013-05-13 09:03:43.422233385 -0400 +@@ -0,0 +1,73 @@ ++# Locate Lua library ++# This module defines ++# LUA52_FOUND, if false, do not try to link to Lua ++# LUA_LIBRARIES ++# LUA_INCLUDE_DIR, where to find lua.h ++# LUA_VERSION_STRING, the version of Lua found (since CMake 2.8.8) ++# ++# Note that the expected include convention is ++# #include "lua.h" ++# and not ++# #include <lua/lua.h> ++# This is because, the lua location is not standardized and may exist ++# in locations other than lua/ ++ ++#============================================================================= ++# Copyright 2007-2009 Kitware, Inc. ++# ++# Distributed under the OSI-approved BSD License (the "License"); ++# see accompanying file Copyright.txt for details. ++# ++# This software is distributed WITHOUT ANY WARRANTY; without even the ++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++# See the License for more information. ++#============================================================================= ++# (To distribute this file outside of CMake, substitute the full ++# License text for the above reference.) ++ ++find_path(LUA_INCLUDE_DIR lua.h ++ HINTS ++ ENV LUA_DIR ++ PATH_SUFFIXES include/lua52 include/lua5.2 include/lua-5.2 include/lua include ++ PATHS ++ ~/Library/Frameworks ++ /Library/Frameworks ++ /sw # Fink ++ /opt/local # DarwinPorts ++ /opt/csw # Blastwave ++ /opt ++) ++ ++find_library(LUA_LIBRARY ++ NAMES lua52 lua5.2 lua-5.2 lua ++ HINTS ++ ENV LUA_DIR ++ PATH_SUFFIXES lib ++ PATHS ++ ~/Library/Frameworks ++ /Library/Frameworks ++ /sw ++ /opt/local ++ /opt/csw ++ /opt ++) ++ ++if(LUA_LIBRARY) ++ # include the math library for Unix ++ if(UNIX AND NOT APPLE AND NOT BEOS) ++ find_library(LUA_MATH_LIBRARY m) ++ set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") ++ # For Windows and Mac, don't need to explicitly include the math library ++ else() ++ set( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries") ++ endif() ++endif() ++ ++include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) ++# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if ++# all listed variables are TRUE ++FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua52 ++ REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR) ++ ++mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY) ++
View file
cmake-FindFreetype.patch
Added
@@ -0,0 +1,43 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Sun Dec 8 13:38:06 UTC 2013 +Subject: fix check for freetype-2.5.1 + +--- cmake/Modules/FindFreetype.cmake ++++ cmake/Modules/FindFreetype.cmake +@@ -64,6 +64,19 @@ + PATH_SUFFIXES include/freetype2 include + ) + ++if(NOT FREETYPE_INCLUDE_DIR_freetype2) ++ find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h ++ HINTS ++ ENV FREETYPE_DIR ++ PATHS ++ /usr/X11R6 ++ /usr/local/X11R6 ++ /usr/local/X11 ++ /usr/freeware ++ PATH_SUFFIXES include/freetype2 include ++ ) ++endif() ++ + find_library(FREETYPE_LIBRARY + NAMES freetype libfreetype freetype219 + HINTS +@@ -82,8 +95,14 @@ + endif() + set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}") + +-if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") +- file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str ++if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") ++ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") ++elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") ++ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") ++endif() ++ ++if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H) ++ file(STRINGS "${FREETYPE_H}" freetype_version_str + REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$") + + unset(FREETYPE_VERSION_STRING)
View file
cmake-FindPostgreSQL.patch
Added
@@ -0,0 +1,163 @@ +diff -up cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake.findpostgresql cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake +--- cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake.findpostgresql 2012-10-24 11:12:01.000000000 -0600 ++++ cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake 2012-10-24 19:49:54.189433358 -0600 +@@ -92,77 +92,99 @@ set( PostgreSQL_ROOT_DIRECTORIES + # + # Look for an installation. + # +-find_path(PostgreSQL_INCLUDE_DIR +- NAMES libpq-fe.h ++find_path(PostgreSQL_CONFIG_DIR ++ NAMES pg_config + PATHS + # Look in other places. + ${PostgreSQL_ROOT_DIRECTORIES} + PATH_SUFFIXES +- pgsql +- postgresql +- include ++ "" ++ bin + # Help the user find it if we cannot. +- DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}" ++ DOC "The ${PostgreSQL_ROOT_DIR_MESSAGE}" + ) + +-find_path(PostgreSQL_TYPE_INCLUDE_DIR +- NAMES catalog/pg_type.h +- PATHS +- # Look in other places. +- ${PostgreSQL_ROOT_DIRECTORIES} +- PATH_SUFFIXES +- postgresql +- pgsql/server +- postgresql/server +- include/server +- # Help the user find it if we cannot. +- DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}" +-) +- +-# The PostgreSQL library. +-set (PostgreSQL_LIBRARY_TO_FIND pq) +-# Setting some more prefixes for the library +-set (PostgreSQL_LIB_PREFIX "") +-if ( WIN32 ) +- set (PostgreSQL_LIB_PREFIX ${PostgreSQL_LIB_PREFIX} "lib") +- set ( PostgreSQL_LIBRARY_TO_FIND ${PostgreSQL_LIB_PREFIX}${PostgreSQL_LIBRARY_TO_FIND}) +-endif() ++macro (fail_if) ++ if (${ARGV}) ++ message (WARNING "Couldn't determine PostgreSQL configuration.") ++ unset (PostgreSQL_CONFIG_DIR) ++ break () ++ endif () ++endmacro () ++ ++macro (run_pg_config arg var) ++ execute_process(COMMAND ${PostgreSQL_CONFIG_DIR}/pg_config ${arg} ++ RESULT_VARIABLE pgsql_config_result ++ OUTPUT_VARIABLE ${var} ++ OUTPUT_STRIP_TRAILING_WHITESPACE) ++ ++ fail_if (NOT ${pgsql_config_result} EQUAL 0 OR NOT ${var}) ++endmacro () ++ ++foreach (once only) ++ fail_if (NOT PostgreSQL_CONFIG_DIR) ++ ++ run_pg_config (--version PostgreSQL_VERSION_STRING) ++ string (REGEX REPLACE "^PostgreSQL (.*)$" "\\1" ++ PostgreSQL_VERSION_STRING "${PostgreSQL_VERSION_STRING}") ++ fail_if (NOT PostgreSQL_VERSION_STRING) ++ ++ run_pg_config (--includedir PostgreSQL_INCLUDE_DIR) ++ fail_if (NOT EXISTS "${PostgreSQL_INCLUDE_DIR}/libpq-fe.h") ++ ++ find_path(PostgreSQL_TYPE_INCLUDE_DIR ++ NAMES catalog/pg_type.h ++ PATHS ${PostgreSQL_INCLUDE_DIR} ++ PATH_SUFFIXES ++ pgsql/server ++ postgresql/server ++ include/server ++ # Help the user find it if we cannot. ++ DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}" ++ ) ++ fail_if (NOT PostgreSQL_TYPE_INCLUDE_DIR) ++ ++ set (PostgreSQL_INCLUDE_DIRS ++ ${PostgreSQL_INCLUDE_DIR} ${PostgreSQL_TYPE_INCLUDE_DIR}) ++ ++ run_pg_config (--libdir PostgreSQL_LIBRARY_DIRS) ++ ++ # The PostgreSQL library. ++ set (PostgreSQL_LIBRARY_TO_FIND pq) ++ # Setting some more prefixes for the library ++ set (PostgreSQL_LIB_PREFIX "") ++ if (WIN32) ++ set (PostgreSQL_LIB_PREFIX ${PostgreSQL_LIB_PREFIX} "lib") ++ set (PostgreSQL_LIBRARY_TO_FIND ${PostgreSQL_LIB_PREFIX}${PostgreSQL_LIBRARY_TO_FIND}) ++ endif() ++ ++ find_library (PostgreSQL_LIBRARY ++ NAMES ${PostgreSQL_LIBRARY_TO_FIND} ++ PATHS ${PostgreSQL_LIBRARY_DIRS} ++ PATH_SUFFIXES lib ++ ) ++ fail_if (NOT PostgreSQL_LIBRARY) ++ set (PostgreSQL_LIBRARIES ${PostgreSQL_LIBRARY_TO_FIND}) + +-find_library( PostgreSQL_LIBRARY +- NAMES ${PostgreSQL_LIBRARY_TO_FIND} +- PATHS +- ${PostgreSQL_ROOT_DIRECTORIES} +- PATH_SUFFIXES +- lib +-) +-get_filename_component(PostgreSQL_LIBRARY_DIR ${PostgreSQL_LIBRARY} PATH) +- +-if (PostgreSQL_INCLUDE_DIR AND EXISTS "${PostgreSQL_INCLUDE_DIR}/pg_config.h") +- file(STRINGS "${PostgreSQL_INCLUDE_DIR}/pg_config.h" pgsql_version_str +- REGEX "^#define[\t ]+PG_VERSION[\t ]+\".*\"") +- +- string(REGEX REPLACE "^#define[\t ]+PG_VERSION[\t ]+\"([^\"]*)\".*" "\\1" +- PostgreSQL_VERSION_STRING "${pgsql_version_str}") +- unset(pgsql_version_str) +-endif() ++endforeach() + + # Did we find anything? +-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +-find_package_handle_standard_args(PostgreSQL +- REQUIRED_VARS PostgreSQL_LIBRARY PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR +- VERSION_VAR PostgreSQL_VERSION_STRING) +-set( PostgreSQL_FOUND ${POSTGRESQL_FOUND}) ++include (FindPackageHandleStandardArgs) ++find_package_handle_standard_args (PostgreSQL ++ REQUIRED_VARS ++ PostgreSQL_LIBRARY_DIRS ++ PostgreSQL_CONFIG_DIR ++ PostgreSQL_INCLUDE_DIRS ++ PostgreSQL_LIBRARIES ++ VERSION_VAR ++ PostgreSQL_VERSION_STRING ++) ++set (PostgreSQL_FOUND ${POSTGRESQL_FOUND}) + + # Now try to get the include and library path. +-if(PostgreSQL_FOUND) +- +- set(PostgreSQL_INCLUDE_DIRS ${PostgreSQL_INCLUDE_DIR} ${PostgreSQL_TYPE_INCLUDE_DIR} ) +- set(PostgreSQL_LIBRARY_DIRS ${PostgreSQL_LIBRARY_DIR} ) +- set(PostgreSQL_LIBRARIES ${PostgreSQL_LIBRARY_TO_FIND}) +- +- #message("Final PostgreSQL include dir: ${PostgreSQL_INCLUDE_DIRS}") +- #message("Final PostgreSQL library dir: ${PostgreSQL_LIBRARY_DIRS}") +- #message("Final PostgreSQL libraries: ${PostgreSQL_LIBRARIES}") ++if (PostgreSQL_FOUND) ++ message (STATUS "PostgreSQL include dirs: ${PostgreSQL_INCLUDE_DIRS}") ++ message (STATUS "PostgreSQL library dirs: ${PostgreSQL_LIBRARY_DIRS}") ++ message (STATUS "PostgreSQL libraries: ${PostgreSQL_LIBRARIES}") + endif() + +-mark_as_advanced(PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR PostgreSQL_LIBRARY )
View file
cmake-FindPythonLibs.patch
Added
@@ -0,0 +1,29 @@ +diff -rupN cmake/Modules/FindPythonLibs.cmake new/Modules/FindPythonLibs.cmake +--- cmake/Modules/FindPythonLibs.cmake 2013-04-12 14:09:08.470669049 -0500 ++++ new/Modules/FindPythonLibs.cmake 2013-04-12 15:41:15.789496153 -0500 +@@ -69,10 +69,21 @@ endif() + + # Set up the versions we know about, in the order we will search. Always add + # the user supplied additional versions to the front. +-set(_Python_VERSIONS +- ${Python_ADDITIONAL_VERSIONS} +- ${_PYTHON_FIND_OTHER_VERSIONS} +- ) ++# If FindPythonInterp has already found the major and minor version, ++# insert that version between the user supplied versions and the stock ++# version list. ++if(DEFINED PYTHON_VERSION_MAJOR AND DEFINED PYTHON_VERSION_MINOR) ++ set(_Python_VERSIONS ++ ${Python_ADDITIONAL_VERSIONS} ++ ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} ++ ${_PYTHON_FIND_OTHER_VERSIONS} ++ ) ++else() ++ set(_Python_VERSIONS ++ ${Python_ADDITIONAL_VERSIONS} ++ ${_PYTHON_FIND_OTHER_VERSIONS} ++ ) ++endif() + + unset(_PYTHON_FIND_OTHER_VERSIONS) + unset(_PYTHON1_VERSIONS)
View file
cmake-boostmpi.patch
Added
@@ -0,0 +1,67 @@ +commit a22eeca3fd7fe022e06001428d5e903913467fa0 +Author: Brad King <brad.king@kitware.com> +Date: Fri Feb 7 16:45:10 2014 -0500 + + FindBoost: Search next to MPI libraries for boost_mpi (#14739) + + Some distributions place boost_mpi next to the MPI libraries against + which it was built instead of next to the other Boost libraries. If + find_package(MPI) has already been run prior to find_package(Boost) then + MPI_CXX_LIBRARIES or MPI_C_LIBRARIES may be set to the location of the + MPI libraries. Teach FindBoost.cmake to look there for boost_mpi and + boost_mpi_python after looking next to the other Boost libraries but + not consider the location to be Boost_LIBRARY_DIR. + +diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake +index ae8baab..945694d 100644 +--- a/Modules/FindBoost.cmake ++++ b/Modules/FindBoost.cmake +@@ -305,10 +305,15 @@ endmacro() + macro(_Boost_FIND_LIBRARY var) + find_library(${var} ${ARGN}) + +- # If we found the first library save Boost_LIBRARY_DIR. +- if(${var} AND NOT Boost_LIBRARY_DIR) +- get_filename_component(_dir "${${var}}" PATH) +- set(Boost_LIBRARY_DIR "${_dir}" CACHE PATH "Boost library directory" FORCE) ++ if(${var}) ++ # If this is the first library found then save Boost_LIBRARY_DIR. ++ if(NOT Boost_LIBRARY_DIR) ++ get_filename_component(_dir "${${var}}" PATH) ++ set(Boost_LIBRARY_DIR "${_dir}" CACHE PATH "Boost library directory" FORCE) ++ endif() ++ elseif(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT) ++ # Try component-specific hints but do not save Boost_LIBRARY_DIR. ++ find_library(${var} HINTS ${_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT} ${ARGN}) + endif() + + # If Boost_LIBRARY_DIR is known then search only there. +@@ -935,6 +940,28 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) + set( _boost_docstring_release "Boost ${COMPONENT} library (release)") + set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)") + ++ # Compute component-specific hints. ++ set(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT "") ++ if(${COMPONENT} STREQUAL "mpi" OR ${COMPONENT} STREQUAL "mpi_python") ++ foreach(lib ${MPI_CXX_LIBRARIES} ${MPI_C_LIBRARIES}) ++ if(IS_ABSOLUTE "${lib}") ++ get_filename_component(libdir "${lib}" PATH) ++ string(REPLACE "\\" "/" libdir "${libdir}") ++ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT ${libdir}) ++ endif() ++ endforeach() ++ endif() ++ ++ # Consolidate and report component-specific hints. ++ if(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT) ++ list(REMOVE_DUPLICATES _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT) ++ if(Boost_DEBUG) ++ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ "Component-specific library search paths for ${COMPONENT}: " ++ "${_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT}") ++ endif() ++ endif() ++ + # + # Find RELEASE libraries + #
View file
cmake-desktop_icon.patch
Added
@@ -0,0 +1,14 @@ +diff -up cmake-2.8.10.1/Source/QtDialog/CMake.desktop\~ cmake-2.8.10.1/Source/QtDialog/CMake.desktop +--- cmake-2.8.10.1/Source/QtDialog/CMake.desktop~ 2012-11-06 20:41:36.000000000 +0100 ++++ cmake-2.8.10.1/Source/QtDialog/CMake.desktop 2012-12-06 01:02:51.054110499 +0100 +@@ -3,7 +3,7 @@ Version=1.0 + Name=CMake + Comment=Cross-platform buildsystem + Exec=cmake-gui %f +-Icon=CMakeSetup32.png ++Icon=CMakeSetup32 + Terminal=false + X-MultipleArgs=false + Type=Application + +Diff finished. Thu Dec 6 01:03:01 2012
View file
cmake-findruby.patch
Added
@@ -0,0 +1,20 @@ +diff -up cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby cmake-2.8.10-rc1/Modules/FindRuby.cmake +--- cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby 2012-10-02 10:12:18.000000000 -0600 ++++ cmake-2.8.10-rc1/Modules/FindRuby.cmake 2012-10-02 15:50:30.463292214 -0600 +@@ -92,14 +92,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO + _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR) + _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) + +- # vendor_ruby available ? +- execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'" +- OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET) +- +- if(RUBY_HAS_VENDOR_RUBY) +- _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR) +- _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR) +- endif() ++ _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR) ++ _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR) + + # save the results in the cache so we don't have to run ruby the next time again + set(RUBY_VERSION_MAJOR ${RUBY_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE)
View file
cmake-ninja.patch
Added
@@ -0,0 +1,23 @@ +diff -up cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake.ninja cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake +--- cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake.ninja 2012-11-27 06:26:32.000000000 -0700 ++++ cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake 2013-02-08 09:30:26.437739370 -0700 +@@ -12,6 +12,6 @@ + # (To distribute this file outside of CMake, substitute the full + # License text for the above reference.) + +-find_program(CMAKE_MAKE_PROGRAM ninja ++find_program(CMAKE_MAKE_PROGRAM ninja-build + DOC "Program used to build from build.ninja files.") + mark_as_advanced(CMAKE_MAKE_PROGRAM) +diff -up cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx.ninja cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx +--- cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx.ninja 2012-11-27 06:26:33.000000000 -0700 ++++ cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx 2013-02-08 09:32:30.397949661 -0700 +@@ -1034,7 +1034,7 @@ std::string cmGlobalNinjaGenerator::ninj + lgen->GetMakefile()->GetRequiredDefinition("CMAKE_MAKE_PROGRAM"), + cmLocalGenerator::SHELL); + } +- return "ninja"; ++ return "ninja-build"; + } + + void cmGlobalNinjaGenerator::WriteTargetClean(std::ostream& os)
View file
cmake-qtdeps.patch
Added
@@ -0,0 +1,54 @@ +diff -up cmake-2.8.12/Modules/UseQt4.cmake.qtdeps cmake-2.8.12/Modules/UseQt4.cmake +--- cmake-2.8.12/Modules/UseQt4.cmake.qtdeps 2013-10-07 09:31:00.000000000 -0600 ++++ cmake-2.8.12/Modules/UseQt4.cmake 2013-10-23 10:39:14.763568925 -0600 +@@ -56,39 +56,13 @@ if (QT_USE_QT3SUPPORT) + add_definitions(-DQT3_SUPPORT) + endif () + +-# list dependent modules, so dependent libraries are added +-set(QT_QT3SUPPORT_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE) +-set(QT_QTSVG_MODULE_DEPENDS QTGUI QTXML QTCORE) +-set(QT_QTUITOOLS_MODULE_DEPENDS QTGUI QTXML QTCORE) +-set(QT_QTHELP_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE) +-if(QT_QTDBUS_FOUND) +- set(QT_PHONON_MODULE_DEPENDS QTGUI QTDBUS QTCORE) +-else() +- set(QT_PHONON_MODULE_DEPENDS QTGUI QTCORE) +-endif() +-set(QT_QTDBUS_MODULE_DEPENDS QTXML QTCORE) +-set(QT_QTXMLPATTERNS_MODULE_DEPENDS QTNETWORK QTCORE) +-set(QT_QAXCONTAINER_MODULE_DEPENDS QTGUI QTCORE) +-set(QT_QAXSERVER_MODULE_DEPENDS QTGUI QTCORE) +-set(QT_QTSCRIPTTOOLS_MODULE_DEPENDS QTGUI QTCORE) +-set(QT_QTWEBKIT_MODULE_DEPENDS QTXMLPATTERNS QTGUI QTCORE) +-set(QT_QTDECLARATIVE_MODULE_DEPENDS QTSCRIPT QTSVG QTSQL QTXMLPATTERNS QTGUI QTCORE) +-set(QT_QTMULTIMEDIA_MODULE_DEPENDS QTGUI QTCORE) +-set(QT_QTOPENGL_MODULE_DEPENDS QTGUI QTCORE) +-set(QT_QTSCRIPT_MODULE_DEPENDS QTCORE) +-set(QT_QTGUI_MODULE_DEPENDS QTCORE) +-set(QT_QTTEST_MODULE_DEPENDS QTCORE) +-set(QT_QTXML_MODULE_DEPENDS QTCORE) +-set(QT_QTSQL_MODULE_DEPENDS QTCORE) +-set(QT_QTNETWORK_MODULE_DEPENDS QTCORE) +- + # Qt modules (in order of dependence) + foreach(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN + QAXSERVER QAXCONTAINER QTDECLARATIVE QTSCRIPT QTSVG QTUITOOLS QTHELP + QTWEBKIT PHONON QTSCRIPTTOOLS QTMULTIMEDIA QTXMLPATTERNS QTGUI QTTEST + QTDBUS QTXML QTSQL QTNETWORK QTCORE) + +- if (QT_USE_${module} OR QT_USE_${module}_DEPENDS) ++ if (QT_USE_${module}) + if (QT_${module}_FOUND) + if(QT_USE_${module}) + string(REPLACE "QT" "" qt_module_def "${module}") +@@ -104,9 +78,6 @@ foreach(module QT3SUPPORT QTOPENGL QTASS + if(QT_IS_STATIC) + set(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIB_DEPENDENCIES}) + endif() +- foreach(depend_module ${QT_${module}_MODULE_DEPENDS}) +- set(QT_USE_${depend_module}_DEPENDS 1) +- endforeach() + else () + message("Qt ${module} library not found.") + endif ()
View file
cmake-strict_aliasing.patch
Added
@@ -0,0 +1,19 @@ +diff -up cmake-2.8.11/Source/CMakeLists.txt\~ cmake-2.8.11/Source/CMakeLists.txt +--- cmake-2.8.11/Source/CMakeLists.txt~ 2013-05-15 19:38:13.000000000 +0200 ++++ cmake-2.8.11/Source/CMakeLists.txt 2013-07-25 16:35:01.200389140 +0200 +@@ -308,6 +308,13 @@ if(APPLE) + cmLocalXCodeGenerator.h) + endif() + ++# GCC shows strict aliasing warnings with cm_sha2.c. Turn off the ++# corresponding optimizations. ++if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC) ++ set_source_files_properties(cm_sha2.c PROPERTIES ++ COMPILE_FLAGS "-fno-strict-aliasing") ++endif() ++ + + if (WIN32) + set(SRCS ${SRCS} + +Diff finished. Thu Jul 25 16:35:18 2013
View file
cmake-init.el
Added
@@ -0,0 +1,9 @@ +;; +;; Setup cmake-mode for autoloading +;; +(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake listfiles." t) +(setq auto-mode-alist + (append + '(("CMakeLists\\.txt\\'" . cmake-mode)) + '(("\\.cmake\\'" . cmake-mode)) + auto-mode-alist))
View file
macros.cmake
Added
@@ -0,0 +1,34 @@ +# +# Macros for cmake +# +%_cmake_lib_suffix64 -DLIB_SUFFIX=64 +%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON +%_cmake_version @@CMAKE_VERSION@@ +%__cmake /usr/bin/cmake + +# - Set default compile flags +# - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables +# and default to -O3 -DNDEBUG. Strip the -O3 so we can override with *FLAGS +# - Turn on verbose makefiles so we can see and verify compile flags +# - Set default install prefixes and library install directories +# - Turn on shared libraries by default +%cmake \ + CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ + CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ + FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \ + FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS ; \ + %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \ + %__cmake \\\ + -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ + -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ + -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ + -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ + -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ + -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ + -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ +%if "%{?_lib}" == "lib64" \ + %{?_cmake_lib_suffix64} \\\ +%endif \ + -DBUILD_SHARED_LIBS:BOOL=ON
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.