basebuilder_pel7ppc64bebuilder0
6 years ago
17 changed files with 1447 additions and 0 deletions
@ -0,0 +1,77 @@
@@ -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) |
||||
+ |
@ -0,0 +1,38 @@
@@ -0,0 +1,38 @@
|
||||
diff -Nrup a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake |
||||
--- a/Modules/FindImageMagick.cmake 2014-01-16 12:15:08.000000000 -0500 |
||||
+++ b/Modules/FindImageMagick.cmake 2016-02-29 23:07:06.439208172 -0500 |
||||
@@ -69,17 +69,24 @@ |
||||
# (To distribute this file outside of CMake, substitute the full |
||||
# License text for the above reference.) |
||||
|
||||
+find_package(PkgConfig QUIET) |
||||
+ |
||||
#--------------------------------------------------------------------- |
||||
# Helper functions |
||||
#--------------------------------------------------------------------- |
||||
function(FIND_IMAGEMAGICK_API component header) |
||||
set(ImageMagick_${component}_FOUND FALSE PARENT_SCOPE) |
||||
|
||||
+ pkg_check_modules(PC_${component} QUIET ${component}) |
||||
+ |
||||
find_path(ImageMagick_${component}_INCLUDE_DIR |
||||
NAMES ${header} |
||||
PATHS |
||||
${ImageMagick_INCLUDE_DIRS} |
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" |
||||
+ HINTS |
||||
+ ${PC_${component}_INCLUDEDIR} |
||||
+ ${PC_${component}_INCLUDE_DIRS} |
||||
PATH_SUFFIXES |
||||
ImageMagick ImageMagick-6 |
||||
DOC "Path to the ImageMagick include dir." |
||||
@@ -88,6 +95,9 @@ function(FIND_IMAGEMAGICK_API component |
||||
NAMES ${ARGN} |
||||
PATHS |
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/lib" |
||||
+ HINTS |
||||
+ ${PC_${component}_LIBDIR} |
||||
+ ${PC_${component}_LIB_DIRS} |
||||
DOC "Path to the ImageMagick Magick++ library." |
||||
) |
||||
|
@ -0,0 +1,40 @@
@@ -0,0 +1,40 @@
|
||||
diff -Nrup a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake |
||||
--- a/Modules/FindFreetype.cmake 2014-01-16 12:15:08.000000000 -0500 |
||||
+++ b/Modules/FindFreetype.cmake 2016-03-02 17:06:31.962906464 -0500 |
||||
@@ -70,6 +70,19 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 |
||||
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 |
||||
@@ -91,8 +104,14 @@ if(FREETYPE_INCLUDE_DIR_ft2build AND FRE |
||||
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) |
@ -0,0 +1,12 @@
@@ -0,0 +1,12 @@
|
||||
diff -Nrup a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake |
||||
--- a/Modules/FindJNI.cmake 2013-05-15 13:38:12.000000000 -0400 |
||||
+++ b/Modules/FindJNI.cmake 2014-08-20 11:12:51.011021582 -0400 |
||||
@@ -45,6 +45,8 @@ macro(java_append_library_directories _v |
||||
# mips* machines are bi-endian mostly so processor does not tell |
||||
# endianess of the underlying system. |
||||
set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb") |
||||
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le") |
||||
+ set(_java_libarch "ppc64" "ppc64le") |
||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") |
||||
set(_java_libarch "ppc64") |
||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") |
@ -0,0 +1,163 @@
@@ -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 ) |
@ -0,0 +1,29 @@
@@ -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) |
@ -0,0 +1,12 @@
@@ -0,0 +1,12 @@
|
||||
diff -Nrup a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake |
||||
--- a/Modules/FindPythonLibs.cmake 2014-01-16 12:15:08.000000000 -0500 |
||||
+++ b/Modules/FindPythonLibs.cmake 2016-02-28 23:21:53.334794362 -0500 |
||||
@@ -38,7 +38,7 @@ CMAKE_FIND_FRAMEWORKS(Python) |
||||
|
||||
set(_PYTHON1_VERSIONS 1.6 1.5) |
||||
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) |
||||
-set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0) |
||||
+set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0) |
||||
|
||||
if(PythonLibs_FIND_VERSION) |
||||
if(PythonLibs_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$") |
@ -0,0 +1,66 @@
@@ -0,0 +1,66 @@
|
||||
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 -Nrup a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake |
||||
--- a/Modules/FindBoost.cmake 2014-01-16 12:15:08.000000000 -0500 |
||||
+++ b/Modules/FindBoost.cmake 2016-03-02 16:10:18.252811225 -0500 |
||||
@@ -279,10 +279,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. |
||||
@@ -906,6 +911,28 @@ foreach(COMPONENT ${Boost_FIND_COMPONENT |
||||
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 |
||||
# |
@ -0,0 +1,90 @@
@@ -0,0 +1,90 @@
|
||||
diff -up cmake-2.8.6-rc1/Modules/FindDCMTK.cmake.dcmtk cmake-2.8.6-rc1/Modules/FindDCMTK.cmake |
||||
--- cmake-2.8.6-rc1/Modules/FindDCMTK.cmake.dcmtk 2011-08-26 10:51:46.000000000 -0600 |
||||
+++ cmake-2.8.6-rc1/Modules/FindDCMTK.cmake 2011-08-29 16:58:07.299550799 -0600 |
||||
@@ -30,6 +30,10 @@ |
||||
# Written for VXL by Amitha Perera. |
||||
# Upgraded for GDCM by Mathieu Malaterre. |
||||
# Modified for EasyViz by Thomas Sondergaard. |
||||
+# |
||||
+# Wed Jul 27 2011 Ankur Sinha <ankursinha AT fedoraproject DOT org> |
||||
+# - Add all dcmtk libs |
||||
+# - Add usr/lib to paths |
||||
# |
||||
|
||||
if(NOT DCMTK_FOUND AND NOT DCMTK_DIR) |
||||
@@ -44,20 +48,26 @@ endif() |
||||
|
||||
foreach(lib |
||||
dcmdata |
||||
+ dcmdsig |
||||
dcmimage |
||||
dcmimgle |
||||
dcmjpeg |
||||
+ dcmjpls |
||||
dcmnet |
||||
dcmpstat |
||||
dcmqrdb |
||||
- dcmsign |
||||
dcmsr |
||||
dcmtls |
||||
+ dcmwlm |
||||
ijg12 |
||||
ijg16 |
||||
ijg8 |
||||
+ libi2d |
||||
+ oflog |
||||
ofstd) |
||||
|
||||
+ |
||||
+ |
||||
find_library(DCMTK_${lib}_LIBRARY |
||||
${lib} |
||||
PATHS |
||||
@@ -66,7 +76,8 @@ foreach(lib |
||||
${DCMTK_DIR}/${lib}/libsrc/Debug |
||||
${DCMTK_DIR}/${lib}/Release |
||||
${DCMTK_DIR}/${lib}/Debug |
||||
- ${DCMTK_DIR}/lib) |
||||
+ ${DCMTK_DIR}/lib |
||||
+ /usr/lib/dcmtk) |
||||
|
||||
mark_as_advanced(DCMTK_${lib}_LIBRARY) |
||||
|
||||
@@ -82,13 +93,16 @@ set(DCMTK_dcmdata_TEST_HEADER dctypes.h) |
||||
set(DCMTK_dcmimage_TEST_HEADER dicoimg.h) |
||||
set(DCMTK_dcmimgle_TEST_HEADER dcmimage.h) |
||||
set(DCMTK_dcmjpeg_TEST_HEADER djdecode.h) |
||||
+set(DCMTK_dcmjpls_TEST_HEADER djcodecd.h) |
||||
set(DCMTK_dcmnet_TEST_HEADER assoc.h) |
||||
set(DCMTK_dcmpstat_TEST_HEADER dcmpstat.h) |
||||
set(DCMTK_dcmqrdb_TEST_HEADER dcmqrdba.h) |
||||
set(DCMTK_dcmsign_TEST_HEADER sicert.h) |
||||
set(DCMTK_dcmsr_TEST_HEADER dsrtree.h) |
||||
set(DCMTK_dcmtls_TEST_HEADER tlslayer.h) |
||||
+set(DCMTK_dcmwlm_TEST_HEADER wldsfs.h) |
||||
set(DCMTK_ofstd_TEST_HEADER ofstdinc.h) |
||||
+set(DCMTK_oflog_TEST_HEADER oflog.h) |
||||
|
||||
foreach(dir |
||||
config |
||||
@@ -96,16 +110,20 @@ foreach(dir |
||||
dcmimage |
||||
dcmimgle |
||||
dcmjpeg |
||||
+ dcmjpls |
||||
dcmnet |
||||
dcmpstat |
||||
dcmqrdb |
||||
dcmsign |
||||
dcmsr |
||||
dcmtls |
||||
+ dcmwlen |
||||
+ oflog |
||||
ofstd) |
||||
find_path(DCMTK_${dir}_INCLUDE_DIR |
||||
${DCMTK_${dir}_TEST_HEADER} |
||||
PATHS |
||||
+ /usr/include/dcmtk |
||||
${DCMTK_DIR}/${dir}/include |
||||
${DCMTK_DIR}/${dir} |
||||
${DCMTK_DIR}/include/${dir} |
@ -0,0 +1,14 @@
@@ -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 |
@ -0,0 +1,20 @@
@@ -0,0 +1,20 @@
|
||||
diff -Nrup a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake |
||||
--- a/Modules/FindRuby.cmake 2014-01-16 12:15:08.000000000 -0500 |
||||
+++ b/Modules/FindRuby.cmake 2016-03-02 16:10:18.242811297 -0500 |
||||
@@ -101,14 +101,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) |
@ -0,0 +1,55 @@
@@ -0,0 +1,55 @@
|
||||
diff -Nrup a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake |
||||
--- a/Modules/FindQt4.cmake 2014-01-16 12:15:08.000000000 -0500 |
||||
+++ b/Modules/FindQt4.cmake 2016-02-29 18:39:54.384628635 -0500 |
||||
@@ -886,16 +886,20 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) |
||||
endforeach() |
||||
|
||||
if(Q_WS_WIN) |
||||
- set(QT_MODULES ${QT_MODULES} QAxContainer QAxServer) |
||||
- # Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR |
||||
- find_path(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt |
||||
- PATHS ${QT_HEADERS_DIR}/ActiveQt |
||||
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH |
||||
- ) |
||||
- find_path(QT_QAXSERVER_INCLUDE_DIR ActiveQt |
||||
- PATHS ${QT_HEADERS_DIR}/ActiveQt |
||||
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH |
||||
- ) |
||||
+ if (QT_QAXCONTAINER_FOUND) |
||||
+ set(QT_MODULES ${QT_MODULES} QAxContainer) |
||||
+ # Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR |
||||
+ find_path(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt |
||||
+ PATHS ${QT_HEADERS_DIR}/ActiveQt |
||||
+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH |
||||
+ ) |
||||
+ endif() |
||||
+ if (QT_QAXSERVER_FOUND) |
||||
+ find_path(QT_QAXSERVER_INCLUDE_DIR ActiveQt |
||||
+ PATHS ${QT_HEADERS_DIR}/ActiveQt |
||||
+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH |
||||
+ ) |
||||
+ endif() |
||||
endif() |
||||
|
||||
# Set QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR |
||||
@@ -1057,8 +1061,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) |
||||
if(Q_WS_WIN) |
||||
_QT4_ADJUST_LIB_VARS(qtmain) |
||||
|
||||
- _QT4_ADJUST_LIB_VARS(QAxServer) |
||||
if(QT_QAXSERVER_FOUND) |
||||
+ _QT4_ADJUST_LIB_VARS(QAxServer) |
||||
set_property(TARGET Qt4::QAxServer PROPERTY |
||||
INTERFACE_QT4_NO_LINK_QTMAIN ON |
||||
) |
||||
@@ -1066,7 +1070,9 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) |
||||
COMPATIBLE_INTERFACE_BOOL QT4_NO_LINK_QTMAIN) |
||||
endif() |
||||
|
||||
- _QT4_ADJUST_LIB_VARS(QAxContainer) |
||||
+ if(QT_QAXCONTAINER_FOUND) |
||||
+ _QT4_ADJUST_LIB_VARS(QAxContainer) |
||||
+ endif() |
||||
endif() |
||||
|
||||
# Only public dependencies are listed here. |
@ -0,0 +1,23 @@
@@ -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) |
@ -0,0 +1,54 @@
@@ -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 () |
@ -0,0 +1,19 @@
@@ -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 |
@ -0,0 +1,34 @@
@@ -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 |
@ -0,0 +1,701 @@
@@ -0,0 +1,701 @@
|
||||
# Set to bcond_without or use --with bootstrap if bootstrapping a new release |
||||
# or architecture |
||||
%bcond_with bootstrap |
||||
# Set to bcond_with or use --without gui to disable qt4 gui build |
||||
%bcond_without gui |
||||
# Set to RC version if building RC, else %{nil} |
||||
%define rcver %{nil} |
||||
|
||||
%define rpm_macros_dir %{_sysconfdir}/rpm |
||||
%if 0%{?fedora} > 18 |
||||
%define rpm_macros_dir %{_rpmconfigdir}/macros.d |
||||
%endif |
||||
|
||||
Name: cmake |
||||
Version: 2.8.12.2 |
||||
Release: 2%{?dist} |
||||
Summary: Cross-platform make system |
||||
|
||||
Group: Development/Tools |
||||
# most sources are BSD |
||||
# Source/CursesDialog/form/ a bunch is MIT |
||||
# Source/kwsys/MD5.c is zlib |
||||
# some GPL-licensed bison-generated files, these all include an exception granting redistribution under terms of your choice |
||||
License: BSD and MIT and zlib |
||||
URL: http://www.cmake.org |
||||
Source0: http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz |
||||
Source2: macros.cmake |
||||
# Patch to find DCMTK in Fedora (bug #720140) |
||||
Patch0: cmake-dcmtk.patch |
||||
# Patch to fix RindRuby vendor settings |
||||
# http://public.kitware.com/Bug/view.php?id=12965 |
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=822796 |
||||
# Patch to use ninja-build instead of ninja (renamed in Fedora) |
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=886184 |
||||
Patch1: cmake-ninja.patch |
||||
Patch2: cmake-findruby.patch |
||||
# Patch to fix FindPostgreSQL |
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=828467 |
||||
# http://public.kitware.com/Bug/view.php?id=13378 |
||||
Patch3: cmake-FindPostgreSQL.patch |
||||
# Patch FindImageMagick.cmake for newer ImageMagick versions |
||||
# http://public.kitware.com/Bug/view.php?id=14012 |
||||
Patch4: cmake-2.8.12.2-IM_pkgconfig_hints.patch |
||||
# Add FindLua52.cmake |
||||
Patch5: cmake-2.8.11-rc4-lua-5.2.patch |
||||
# Fix strict aliasing problems in cm_sha2.c |
||||
Patch6: cmake-strict_aliasing.patch |
||||
# Desktop icon filenames should be without extension |
||||
Patch7: cmake-desktop_icon.patch |
||||
# FindJNI: Add ppc64le architecture |
||||
Patch8: cmake-FindJNI.patch |
||||
# # Fix issue with finding consistent python versions |
||||
# http://public.kitware.com/Bug/view.php?id=13794 |
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=876118 |
||||
Patch9: cmake-FindPythonLibs-1.patch |
||||
# BZ 1246369 add support for python version 3.4 |
||||
Patch10: cmake-FindPythonLibs-2.patch |
||||
# Upstream patch to find Boost MPI library |
||||
# http://www.cmake.org/Bug/view.php?id=14739 |
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=756141 |
||||
Patch11: cmake-boostmpi.patch |
||||
# Fix FindFreetype for 2.5.1+ |
||||
# http://public.kitware.com/Bug/view.php?id=14601 |
||||
Patch12: cmake-FindFreetype.patch |
||||
# Remove automatic Qt module dep adding |
||||
Patch13: cmake-qtdeps.patch |
||||
# BZ 1192188 Don't fail if certain Qt modules are unavailable. |
||||
Patch14: cmake-fix-mingw32-builds-of-Qt4.patch |
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) |
||||
|
||||
BuildRequires: gcc-gfortran |
||||
BuildRequires: ncurses-devel, libX11-devel |
||||
BuildRequires: bzip2-devel |
||||
BuildRequires: curl-devel |
||||
BuildRequires: expat-devel |
||||
BuildRequires: libarchive-devel |
||||
BuildRequires: zlib-devel |
||||
BuildRequires: emacs |
||||
%if %{without bootstrap} |
||||
#BuildRequires: xmlrpc-c-devel |
||||
%endif |
||||
%if %{with gui} |
||||
BuildRequires: qt4-devel, desktop-file-utils |
||||
%define qt_gui --qt-gui |
||||
%endif |
||||
|
||||
Requires: rpm |
||||
|
||||
%if (0%{?fedora} >= 16) |
||||
Requires: emacs-filesystem >= %{_emacs_version} |
||||
%endif |
||||
|
||||
# Source/kwsys/MD5.c |
||||
# see https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries |
||||
Provides: bundled(md5-deutsch) |
||||
|
||||
%description |
||||
CMake is used to control the software compilation process using simple |
||||
platform and compiler independent configuration files. CMake generates |
||||
native makefiles and workspaces that can be used in the compiler |
||||
environment of your choice. CMake is quite sophisticated: it is possible |
||||
to support complex environments requiring system configuration, preprocessor |
||||
generation, code generation, and template instantiation. |
||||
|
||||
|
||||
%package gui |
||||
Summary: Qt GUI for %{name} |
||||
Group: Development/Tools |
||||
Requires: %{name} = %{version}-%{release} |
||||
|
||||
%description gui |
||||
The %{name}-gui package contains the Qt based GUI for CMake. |
||||
|
||||
|
||||
%prep |
||||
%setup -q -n %{name}-%{version}%{?rcver} |
||||
%patch0 -p1 |
||||
%patch1 -p1 |
||||
%patch2 -p1 |
||||
%patch3 -p1 |
||||
%patch4 -p1 |
||||
%patch5 -p1 |
||||
%patch6 -p1 |
||||
%patch7 -p1 |
||||
%patch8 -p1 |
||||
%patch9 -p1 |
||||
%patch10 -p1 |
||||
%patch11 -p1 |
||||
%patch12 -p1 |
||||
%patch13 -p1 |
||||
%patch14 -p1 |
||||
|
||||
|
||||
%build |
||||
export CFLAGS="$RPM_OPT_FLAGS" |
||||
export CXXFLAGS="$RPM_OPT_FLAGS" |
||||
mkdir build |
||||
pushd build |
||||
../bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \ |
||||
--docdir=/share/doc/%{name}-%{version} --mandir=/share/man \ |
||||
--%{?with_bootstrap:no-}system-libs \ |
||||
--parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \ |
||||
%{?qt_gui} |
||||
make VERBOSE=1 %{?_smp_mflags} |
||||
|
||||
|
||||
%install |
||||
pushd build |
||||
make install DESTDIR=%{buildroot} |
||||
find %{buildroot}/%{_datadir}/%{name}/Modules -type f | xargs chmod -x |
||||
popd |
||||
cp -a Example %{buildroot}%{_docdir}/%{name}-%{version}/ |
||||
mkdir -p %{buildroot}%{_emacs_sitelispdir}/%{name} |
||||
install -m 0644 Docs/cmake-mode.el %{buildroot}%{_emacs_sitelispdir}/%{name} |
||||
%{_emacs_bytecompile} %{buildroot}%{_emacs_sitelispdir}/%{name}/cmake-mode.el |
||||
# RPM macros |
||||
install -p -m0644 -D %{SOURCE2} %{buildroot}%{rpm_macros_dir}/macros.cmake |
||||
sed -i -e "s|@@CMAKE_VERSION@@|%{version}|" %{buildroot}%{rpm_macros_dir}/macros.cmake |
||||
touch -r %{SOURCE2} %{buildroot}%{rpm_macros_dir}/macros.cmake |
||||
mkdir -p %{buildroot}%{_libdir}/%{name} |
||||
|
||||
%if %{with gui} |
||||
# Desktop file |
||||
desktop-file-install --delete-original \ |
||||
--dir=%{buildroot}%{_datadir}/applications \ |
||||
%{buildroot}/%{_datadir}/applications/CMake.desktop |
||||
%endif |
||||
|
||||
|
||||
%check |
||||
unset DISPLAY |
||||
pushd build |
||||
#ModuleNotices fails for some unknown reason, and we don't care |
||||
#CMake.HTML currently requires internet access |
||||
#CTestTestUpload requires internet access |
||||
bin/ctest -V -E ModuleNotices -E CMake.HTML -E CTestTestUpload %{?_smp_mflags} |
||||
popd |
||||
|
||||
|
||||
%if %{with gui} |
||||
%post gui |
||||
update-desktop-database &> /dev/null || : |
||||
update-mime-database %{_datadir}/mime &> /dev/null || : |
||||
|
||||
%postun gui |
||||
update-desktop-database &> /dev/null || : |
||||
update-mime-database %{_datadir}/mime &> /dev/null || : |
||||
%endif |
||||
|
||||
|
||||
%files |
||||
%{rpm_macros_dir}/macros.cmake |
||||
%{_docdir}/%{name}-%{version}/ |
||||
%if %{with gui} |
||||
%exclude %{_docdir}/%{name}-%{version}/cmake-gui.* |
||||
%endif |
||||
%{_bindir}/ccmake |
||||
%{_bindir}/cmake |
||||
%{_bindir}/cpack |
||||
%{_bindir}/ctest |
||||
%{_datadir}/aclocal/cmake.m4 |
||||
%{_datadir}/%{name}/ |
||||
%{_mandir}/man1/ccmake.1.gz |
||||
%{_mandir}/man1/cmake.1.gz |
||||
%{_mandir}/man1/cmakecommands.1.gz |
||||
%{_mandir}/man1/cmakecompat.1.gz |
||||
%{_mandir}/man1/cmakemodules.1.gz |
||||
%{_mandir}/man1/cmakepolicies.1.gz |
||||
%{_mandir}/man1/cmakeprops.1.gz |
||||
%{_mandir}/man1/cmakevars.1.gz |
||||
%{_mandir}/man1/cpack.1.gz |
||||
%{_mandir}/man1/ctest.1.gz |
||||
%{_emacs_sitelispdir}/%{name} |
||||
%{_libdir}/%{name}/ |
||||
|
||||
%if %{with gui} |
||||
%files gui |
||||
%{_docdir}/%{name}-%{version}/cmake-gui.* |
||||
%{_bindir}/cmake-gui |
||||
%{_datadir}/applications/CMake.desktop |
||||
%{_datadir}/mime/packages/cmakecache.xml |
||||
%{_datadir}/pixmaps/CMakeSetup32.png |
||||
%{_mandir}/man1/cmake-gui.1.gz |
||||
%endif |
||||
|
||||
|
||||
%changelog |
||||
* Wed Mar 02 2016 Patsy Franklin <pfrankli@redhat.com> - 2.8.12.2-2 |
||||
- Clean up patches and get rid of .orig files. |
||||
|
||||
* Fri Feb 26 2016 Patsy Franklin <pfrankli@redhat.com> - 2.8.12.2-1 |
||||
- Rebase to 2.8.12.2 including some recent patches. (BZ #1195919) |
||||
- Fix to find python libs version 3.4 (BZ #1246369) |
||||
- Don't fail if certain Qt modules are unavailable. (BZ #1192188) |
||||
|
||||
* Wed Aug 20 2014 Patsy Franklin <pfrankli@redhat.com> - 2.8.11-5 |
||||
- Add support for ppc64le to FindJNI.cmake. |
||||
|
||||
* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 2.8.11-4 |
||||
- Mass rebuild 2014-01-24 |
||||
|
||||
* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 2.8.11-3 |
||||
- Mass rebuild 2013-12-27 |
||||
|
||||
* Thu Jul 25 2013 Petr Machata <pmachata@redhat.com> - 2.8.11-2 |
||||
- Pass -fno-strict-aliasing to cm_sha2.c to avoid strict aliasing |
||||
problems that GCC warns about. |
||||
- Icon name in CMake.desktop shouldn't include filename extension. |
||||
|
||||
* Sat May 18 2013 Orion Poplawski <orion@cora.nwra.com> - 2.8.11-1 |
||||
- Update to 2.8.11 release |
||||
|
||||
* Mon May 13 2013 Tom Callaway <spot@fedoraproject.org> - 2.8.11-0.9.rc4 |
||||
- add FindLua52.cmake |
||||
|
||||
* Thu May 9 2013 Orion Poplawski <orion@cora.nwra.com> - 2.8.11-0.8.rc4 |
||||
- Update to 2.8.11-rc4 |
||||
|
||||
* Fri Apr 19 2013 Orion Poplawski <orion@cora.nwra.com> - 2.8.11-0.7.rc3 |
||||
- Update to 2.8.11-rc3 |
||||
|
||||
* Thu Apr 18 2013 Orion Poplawski <orion@cora.nwra.com> - 2.8.11-0.6.rc2 |
||||
- Drop -O3 from default release build type flags in cmake rpm macro (bug 875954) |
||||
|
||||
* Wed Apr 17 2013 Orion Poplawski <orion@cora.nwra.com> - 2.8.11-0.5.rc2 |
||||
- Update to 2.8.11-rc2 |
||||
- Rebase ImageMagick patch |
||||
|
||||
* Mon Mar 18 2013 Rex Dieter <rdieter@fedoraproject.org> 2.8.11-0.4.rc1 |
||||
- respin cmake-2.8.11-rc1-IM_pkgconfig_hints.patch |
||||
- drop/omit backup files when applying patches |
||||
|
||||
* Sat Mar 16 2013 Rex Dieter <rdieter@fedoraproject.org> 2.8.11-0.3.rc1 |
||||
- Patch FindImageMagick.cmake for newer ImageMagick versions |
||||
|
||||
* Sat Mar 16 2013 Rex Dieter <rdieter@fedoraproject.org> 2.8.11-0.2.rc1 |
||||
- use %%{_rpmconfigdir}/macros.d on f19+ |
||||
|
||||
* Fri Mar 14 2013 Orion Poplawski <orion@cora.nwra.com> - 2.8.11-0.1.rc1 |
||||
- Update to 2.8.11-rc1 |
||||
- Drop upstream ccmake and usrmove patches |
||||
|
||||
* Wed Mar 13 2013 Orion Poplawski <orion@cora.nwra.com> - 2.8.10.2-5 |
||||
- Add patch from upstream to fix UsrMove handling (bug #917407) |
||||
- Drop %%config from rpm macros |
||||
- Define FCFLAGS in cmake macro |
||||
|
||||
* Fri Feb 8 2013 Orion Poplawski <orion@cora.nwra.com> - 2.8.10.2-4 |
||||
- Add patch to use ninja-build (bug #886184) |
||||
|
||||
* Thu Jan 24 2013 Orion Poplawski <orion@cora.nwra.com> - 2.8.10.2-3 |
||||
- Update FindPostgreSQL patch to use PostgreSQL_LIBRARY (bug #903757) |
||||
|
||||
* Thu Jan 17 2013 Tomas Bzatek <tbzatek@redhat.com> - 2.8.10.2-2 |
||||
- Rebuilt for new libarchive |
||||
|
||||
* Tue Nov 27 2012 Rex Dieter <rdieter@fedoraproject.org> 2.8.10.2-1 |
||||
- 2.8.10.2 |
||||
|
||||
* Thu Nov 8 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.10.1-1 |
||||
- Update to 2.8.10.1 |
||||
|
||||
* Thu Nov 1 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.10-1 |
||||
- Update to 2.8.10 final |
||||
|
||||
* Thu Oct 24 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.10-0.2.rc3 |
||||
- Add patch to fix DEL key in ccmake (bug 869769) |
||||
|
||||
* Wed Oct 24 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.10-0.1.rc3 |
||||
- Update to 2.8.10 RC 3 |
||||
- Rebase FindRuby and FindPostgreSQL patches |
||||
|
||||
* Thu Aug 9 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.9-1 |
||||
- Update to 2.8.9 final |
||||
|
||||
* Fri Jul 27 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.9-0.4.rc3 |
||||
- Update to 2.8.9 RC 3 |
||||
|
||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.9-0.3.rc2 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild |
||||
|
||||
* Mon Jul 16 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.9-0.2.rc2 |
||||
- Update to 2.8.9 RC 2 |
||||
|
||||
* Tue Jul 10 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.9-0.1.rc1 |
||||
- Update to 2.8.9 RC 1 |
||||
- Drop pkgconfig patch |
||||
|
||||
* Thu Jul 5 2012 Orion Poplawski <orion@cora.nwra.com> 2.8.8-5 |
||||
- Add patch to fix FindPostgreSQL (bug 828467) |
||||
|
||||
* Mon May 21 2012 Orion Poplawski <orion@cora.nwra.com> 2.8.8-4 |
||||
- Add patch to fix FindRuby (bug 822796) |
||||
|
||||
* Thu May 10 2012 Rex Dieter <rdieter@fedoraproject.org> 2.8.8-3 |
||||
- Incorrect license tag in spec file (#820334) |
||||
|
||||
* Thu May 3 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.8-2 |
||||
- Comply with Emacs packaging guidlines (bug #818658) |
||||
|
||||
* Thu Apr 19 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.8-1 |
||||
- Update to 2.8.8 final |
||||
|
||||
* Sat Apr 14 2012 Rex Dieter <rdieter@fedoraproject.org> 2.8.8-0.4.rc2 |
||||
- adjust pkgconfig patch (#812188) |
||||
|
||||
* Fri Apr 13 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.8-0.3.rc2 |
||||
- Add upstream patch to set PKG_CONFIG_FOUND (bug #812188) |
||||
|
||||
* Mon Apr 9 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.8-0.2.rc2 |
||||
- Update to 2.8.8 RC 2 |
||||
|
||||
* Fri Mar 23 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.8-0.1.rc1 |
||||
- Update to 2.8.8 RC 1 |
||||
|
||||
* Tue Feb 21 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.7-6 |
||||
- Just strip CMAKE_INSTALL_LIBDIR from %%cmake macro |
||||
|
||||
* Tue Feb 21 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.7-5 |
||||
- Strip CMAKE_INSTALL_LIBDIR and others from %%cmake macro (bug 795542) |
||||
|
||||
* Thu Jan 26 2012 Tomas Bzatek <tbzatek@redhat.com> - 2.8.7-4 |
||||
- Rebuilt for new libarchive |
||||
|
||||
* Wed Jan 17 2012 Jaroslav Reznik <jreznik@redhat.com> - 2.8.7-3 |
||||
- Rebuild for libarchive |
||||
|
||||
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.7-2 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild |
||||
|
||||
* Sun Jan 1 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.7-1 |
||||
- Update to 2.8.7 final |
||||
|
||||
* Tue Dec 27 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.7-0.2.rc2 |
||||
- Update to 2.8.7 RC 2 |
||||
|
||||
* Tue Dec 13 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.7-0.1.rc1 |
||||
- Update to 2.8.7 RC 1 |
||||
|
||||
* Tue Nov 15 2011 Daniel Drake <dsd@laptop.org> - 2.8.6-2 |
||||
- Rebuild for libarchive.so.11 |
||||
|
||||
* Wed Oct 5 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.6-1 |
||||
- Update to 2.8.6 final |
||||
|
||||
* Thu Sep 22 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.6-0.5.rc4 |
||||
- Update to 2.8.6 RC 4 |
||||
|
||||
* Tue Sep 13 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.6-0.4.rc3 |
||||
- Update to 2.8.6 RC 3 |
||||
|
||||
* Sun Sep 11 2011 Ville Skyttä <ville.skytta@iki.fi> - 2.8.6-0.3.rc2 |
||||
- Sync FFLAGS and LDFLAGS in the %%cmake macro with redhat-rpm-config. |
||||
|
||||
* Tue Sep 6 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.6-0.2.rc2 |
||||
- Update to 2.8.6 RC 2 |
||||
- Drop aclocal patch |
||||
|
||||
* Mon Aug 29 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.6-0.1.rc1 |
||||
- Update to 2.8.6 RC 1 |
||||
- Update dcmtk patch |
||||
- Add upstream patch to fix aclocal install location |
||||
|
||||
* Thu Jul 28 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.5-3 |
||||
- Updated patch to find dcmtk in Fedora (Bug #720140) |
||||
|
||||
* Fri Jul 22 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.5-2 |
||||
- Add patch to find dcmtk in Fedora (Bug #720140) |
||||
|
||||
* Fri Jul 22 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.5-1 |
||||
- Update to 2.8.5 final |
||||
- Drop issue 12307 patch |
||||
|
||||
* Thu Jul 21 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.5-0.3.rc3 |
||||
- Update to 2.8.5 RC 3 |
||||
- Drop upstreamed swig patch |
||||
- Apply upstream fix for issue 12307 (bug #723652) |
||||
|
||||
* Mon Jun 20 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.5-0.2.rc2 |
||||
- Update to 2.8.5 RC 2 |
||||
- Add patch from upstream to fix FindSWIG |
||||
|
||||
* Tue May 31 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.5-0.1.rc1 |
||||
- Update to 2.8.5 RC 1 |
||||
- Disable CTestTestUpload test, needs internet access |
||||
|
||||
* Thu Feb 17 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.4-1 |
||||
- Update to 2.8.4 final |
||||
|
||||
* Wed Feb 2 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.4-0.2.rc2 |
||||
- Update to 2.8.4 RC 2 |
||||
|
||||
* Tue Jan 18 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.4-0.1.rc1 |
||||
- Update to 2.8.4 RC 1 |
||||
- Drop qt4 patch |
||||
|
||||
* Thu Dec 16 2010 Orion Poplawski <orion@cora.nwra.com> - 2.8.3-2 |
||||
- Add patch from upstream git to fix bug 652886 (qt3/qt4 detection) |
||||
|
||||
* Thu Nov 4 2010 Orion Poplawski <orion@cora.nwra.com> - 2.8.3-1 |
||||
- Update to 2.8.3 final |
||||
|
||||
* Mon Nov 1 2010 Orion Poplawski <orion@cora.nwra.com> - 2.8.3-0.3.rc4 |
||||
- Update to 2.8.3 RC 4 |
||||
- Drop python 2.7 patch fixed upstream |
||||
- No need to fixup source file permissions anymore |
||||
|
||||
* Fri Oct 22 2010 Orion Poplawski <orion@cora.nwra.com> - 2.8.3-0.2.rc3 |
||||
- Update to 2.8.3 RC 3 |
||||
|
||||
* Thu Sep 16 2010 Orion Poplawski <orion@cora.nwra.com> - 2.8.3-0.1.rc1 |
||||
- Update to 2.8.3 RC 1 |
||||
- Add BR bzip2-devel and libarchive-devel |
||||
|
||||
* Fri Jul 23 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 2.8.2-2 |
||||
- add support for Python 2.7 to FindPythonLibs.cmake (Orcan Ogetbil) |
||||
|
||||
* Tue Jul 6 2010 Orion Poplawski <orion@cora.nwra.com> - 2.8.2-1 |
||||
- Update to 2.8.2 final |
||||
|
||||
* Thu Jun 23 2010 Orion Poplawski <orion@cora.nwra.com> - 2.8.2-0.3.rc4 |
||||
- Update to 2.8.2 RC 4 |
||||
|
||||
* Wed Jun 23 2010 Orion Poplawski <orion@cora.nwra.com> - 2.8.2-0.2.rc3 |
||||
- Update to 2.8.2 RC 3 |
||||
|
||||
* Mon Jun 21 2010 Orion Poplawski <orion@cora.nwra.com> - 2.8.2-0.1.rc2 |
||||
- Update to 2.8.2 RC 2 |
||||
|
||||
* Thu Jun 3 2010 Orion Poplawski <orion@cora.nwra.com> - 2.8.1-5 |
||||
- Upstream published a newer 2.8.1 tar ball |
||||
|
||||
* Wed Jun 2 2010 Orion Poplawski <orion@cora.nwra.com> - 2.8.1-4 |
||||
- Add BR gcc-gfortran so Fortran support is built |
||||
|
||||
* Wed Apr 21 2010 Orion Poplawski <orion@cora.nwra.com> - 2.8.1-3 |
||||
- Disable ModuleNotices test, re-enable parallel ctest |
||||
|
||||
* Tue Mar 30 2010 Orion Poplawski <orion@cora.nwra.com> - 2.8.1-2 |
||||
- Disable parallel ctest checks for now |
||||
|
||||
* Tue Mar 23 2010 Orion Poplawski <orion@cora.nwra.com> - 2.8.1-1 |
||||
- Update to 2.8.1 final |
||||
|
||||
* Tue Mar 23 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 2.8.1-0.3.rc5 |
||||
- Own /usr/lib(64)/cmake/ |
||||
|
||||
* Fri Mar 12 2010 Orion Poplawski <orion@cora.nwra.com> - 2.8.1-0.2.rc5 |
||||
- Update to 2.8.1 RC 5 |
||||
|
||||
* Fri Feb 19 2010 Orion Poplawski <orion@cora.nwra.com> - 2.8.1-0.1.rc3 |
||||
- Update to 2.8.1 RC 3 |
||||
|
||||
* Thu Jan 14 2010 Rex Dieter <rdieter@fedorproject.org> - 2.8.0-2 |
||||
- macros.cmake: drop -DCMAKE_SKIP_RPATH:BOOL=ON from %%cmake |
||||
|
||||
* Wed Nov 18 2009 Orion Poplawski <orion@cora.nwra.com> - 2.8.0-1 |
||||
- Update to 2.8.0 final |
||||
|
||||
* Wed Nov 18 2009 Rex Dieter <rdieter@fedoraproject.org> - 2.8.0-0.8.rc7 |
||||
- rebuild (for qt-4.6.0-rc1) |
||||
|
||||
* Wed Nov 11 2009 Orion Poplawski <orion@cora.nwra.com> - 2.8.0-0.7.rc7 |
||||
- Update to 2.8.0 RC 7 |
||||
|
||||
* Tue Nov 10 2009 Orion Poplawski <orion@cora.nwra.com> - 2.8.0-0.7.rc6 |
||||
- Update to 2.8.0 RC 6 |
||||
|
||||
* Wed Nov 4 2009 Orion Poplawski <orion@cora.nwra.com> - 2.8.0-0.6.rc5 |
||||
- Update to 2.8.0 RC 5 |
||||
- Drop patches fixed upstream |
||||
|
||||
* Fri Oct 30 2009 Orion Poplawski <orion@cora.nwra.com> - 2.8.0-0.5.rc4 |
||||
- Update to 2.8.0 RC 4 |
||||
- Add FindJNI patch |
||||
- Add test patch from cvs to fix Fedora build test build error |
||||
|
||||
* Tue Oct 13 2009 Orion Poplawski <orion@cora.nwra.com> - 2.8.0-0.4.rc3 |
||||
- Update to 2.8.0 RC 3 |
||||
- Drop vtk64 patch fixed upstream |
||||
|
||||
* Fri Oct 9 2009 Orion Poplawski <orion@cora.nwra.com> - 2.8.0-0.3.rc2 |
||||
- Do out of tree build, needed for ExternalProject test |
||||
|
||||
* Thu Oct 8 2009 Orion Poplawski <orion@cora.nwra.com> - 2.8.0-0.2.rc2 |
||||
- Update to 2.8.0 RC 2 |
||||
- Use parallel ctest in %%check |
||||
|
||||
* Tue Sep 29 2009 Orion Poplawski <orion@cora.nwra.com> - 2.8.0-0.1.rc1 |
||||
- Update to 2.8.0 RC 1 |
||||
|
||||
* Thu Sep 17 2009 Rex Dieter <rdieter@fedoraproject.org> - 2.6.4-4 |
||||
- macro.cmake: prefixes cmake with the package being builts bindir (#523878) |
||||
|
||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.4-3 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild |
||||
|
||||
* Wed Jun 3 2009 Orion Poplawski <orion@cora.nwra.com> - 2.6.4-2 |
||||
- Add patch to find VTK on 64-bit machines (bug #503945) |
||||
|
||||
* Wed Apr 29 2009 Orion Poplawski <orion@cora.nwra.com> - 2.6.4-1 |
||||
- Update to 2.6.4 |
||||
- Drop patch for bug #475876 fixed upstream |
||||
|
||||
* Mon Mar 16 2009 Rex Dieter <rdieter@fedoraproject.org> - 2.6.3-3 |
||||
- macros.cmake: +%%_cmake_version |
||||
|
||||
* Mon Mar 09 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 2.6.3-2 |
||||
- Fix crash during kdepimlibs build (#475876) |
||||
|
||||
* Mon Feb 23 2009 Orion Poplawski <orion@cora.nwra.com> - 2.6.3-1 |
||||
- Update to 2.6.3 final |
||||
|
||||
* Tue Feb 17 2009 Orion Poplawski <orion@cora.nwra.com> - 2.6.3-0.4.rc13 |
||||
- Update to 2.6.3-RC-13 |
||||
|
||||
* Tue Jan 13 2009 Orion Poplawski <orion@cora.nwra.com> - 2.6.3-0.3.rc8 |
||||
- Update to 2.6.3-RC-8 |
||||
|
||||
* Sun Jan 04 2009 Rex Dieter <rdieter@fedoraproject.org> - 2.6.3-0.2.rc5 |
||||
- macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON |
||||
- fix Release tag |
||||
|
||||
* Wed Dec 10 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.3-0.rc5.1 |
||||
- Update to 2.6.3-RC-5 |
||||
|
||||
* Tue Dec 2 2008 Rex Dieter <rdieter@fedoraproject.org> - 2.6.2-3 |
||||
- Add -DCMAKE_VERBOSE_MAKEFILE=ON to %%cmake (#474053) |
||||
- preserve timestamp of macros.cmake |
||||
- cosmetics |
||||
|
||||
* Tue Oct 21 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.2-2 |
||||
- Allow conditional build of gui |
||||
|
||||
* Mon Sep 29 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.2-1 |
||||
- Update to 2.6.2 |
||||
|
||||
* Mon Sep 8 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.2-0.rc3.1 |
||||
- Update to 2.6.2-RC-2 |
||||
- Drop parens patch fixed upstream |
||||
|
||||
* Tue Sep 2 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.1-3 |
||||
- Drop jni patch, applied upstream. |
||||
|
||||
* Tue Aug 26 2008 Rex Dieter <rdieter@fedoraproject.org> - 2.6.1-2 |
||||
- attempt to patch logic error, crasher |
||||
|
||||
* Tue Aug 5 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.1-1 |
||||
- Update to 2.6.1 |
||||
|
||||
* Mon Jul 14 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.1-0.rc8.1 |
||||
- Update to 2.6.1-RC-8 |
||||
- Drop xmlrpc patch fixed upstream |
||||
|
||||
* Tue May 6 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.0-1 |
||||
- Update to 2.6.0 |
||||
|
||||
* Mon May 5 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.0-0.rc10.1 |
||||
- Update to 2.6.0-RC-10 |
||||
|
||||
* Thu Apr 24 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.0-0.rc9.1 |
||||
- Update to 2.6.0-RC-9 |
||||
|
||||
* Fri Apr 11 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.0-0.rc8.1 |
||||
- Update to 2.6.0-RC-8 |
||||
|
||||
* Thu Apr 3 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.0-0.rc6.1 |
||||
- Update to 2.6.0-RC-6 |
||||
|
||||
* Fri Mar 28 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.0-0.rc5.1 |
||||
- Update to 2.6.0-RC-5 |
||||
- Add gui sub-package for Qt frontend |
||||
|
||||
* Fri Mar 7 2008 Orion Poplawski <orion@cora.nwra.com> - 2.4.8-3 |
||||
- Add macro for bootstrapping new release/architecture |
||||
- Add %%check section |
||||
|
||||
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.4.8-2 |
||||
- Autorebuild for GCC 4.3 |
||||
|
||||
* Tue Jan 22 2008 Orion Poplawski <orion@cora.nwra.com> - 2.4.8-1 |
||||
- Update to 2.4.8 |
||||
|
||||
* Wed Jan 16 2008 Orion Poplawski <orion@cora.nwra.com> - 2.4.8-0.rc12 |
||||
- Update to 2.4.8 RC-12 |
||||
|
||||
* Fri Dec 14 2007 Orion Poplawski <orion@cora.nwra.com> - 2.4.8-0.rc4 |
||||
- Update to 2.4.8 RC-4 |
||||
|
||||
* Mon Nov 12 2007 Orion Poplawski <orion@cora.nwra.com> - 2.4.7-4 |
||||
- No longer set CMAKE_SKIP_RPATH |
||||
|
||||
* Tue Aug 28 2007 Orion Poplawski <orion@cora.nwra.com> - 2.4.7-3 |
||||
- Rebuild for new expat |
||||
|
||||
* Wed Aug 22 2007 Orion Poplawski <orion@cora.nwra.com> - 2.4.7-2 |
||||
- Rebuild for BuildID |
||||
|
||||
* Mon Jul 23 2007 Orion Poplawski <orion@cora.nwra.com> - 2.4.7-1 |
||||
- Update to 2.4.7 |
||||
|
||||
* Fri Jun 29 2007 Orion Poplawski <orion@cora.nwra.com> - 2.4.7-0.rc11 |
||||
- Update to 2.4.7 RC-11 |
||||
|
||||
* Wed Jun 27 2007 Orion Poplawski <orion@cora.nwra.com> - 2.4.6-4 |
||||
- Update macros.cmake to add CMAKE_INSTALL_LIBDIR, INCLUDE_INSTALL_DIR, |
||||
LIB_INSTALL_DIR, SYSCONF_INSTALL_DIR, and SHARE_INSTALL_PREFIX |
||||
|
||||
* Mon Apr 16 2007 Orion Poplawski <orion@cora.nwra.com> - 2.4.6-3 |
||||
- Apply patch from upstream CVS to fix .so install permissions (bug #235673) |
||||
|
||||
* Fri Apr 06 2007 Orion Poplawski <orion@cora.nwra.com> - 2.4.6-2 |
||||
- Add rpm macros |
||||
|
||||
* Thu Jan 11 2007 Orion Poplawski <orion@cora.nwra.com> - 2.4.6-1 |
||||
- Update to 2.4.6 |
||||
|
||||
* Mon Dec 18 2006 Orion Poplawski <orion@cora.nwra.com> - 2.4.5-2 |
||||
- Use system libraries (bootstrap --system-libs) |
||||
|
||||
* Tue Dec 5 2006 Orion Poplawski <orion@cora.nwra.com> - 2.4.5-1 |
||||
- Update to 2.4.5 |
||||
|
||||
* Tue Nov 21 2006 Orion Poplawski <orion@cora.nwra.com> - 2.4.4-1 |
||||
- Update to 2.4.4 |
||||
|
||||
* Tue Oct 31 2006 Orion Poplawski <orion@cora.nwra.com> - 2.4.3-4 |
||||
- Add /usr/lib/jvm/java to FindJNI search paths |
||||
|
||||
* Tue Aug 29 2006 Orion Poplawski <orion@cora.nwra.com> - 2.4.3-3 |
||||
- Rebuild for FC6 |
||||
|
||||
* Wed Aug 2 2006 Orion Poplawski <orion@cora.nwra.com> - 2.4.3-2 |
||||
- vim 7.0 now ships cmake files, so don't ship ours (bug #201018) |
||||
- Add patch to Linux.cmake for Fortran soname support for plplot |
||||
|
||||
* Tue Aug 1 2006 Orion Poplawski <orion@cora.nwra.com> - 2.4.3-1 |
||||
- Update to 2.4.3 |
||||
|
||||
* Mon Jul 31 2006 Orion Poplawski <orion@cora.nwra.com> - 2.4.2-3 |
||||
- Update for vim 7.0 |
||||
|
||||
* Tue Jul 11 2006 Orion Poplawski <orion@cora.nwra.com> - 2.4.2-2 |
||||
- Patch FindRuby and FindSWIG to work on Fedora (bug #198103) |
||||
|
||||
* Fri Jun 30 2006 Orion Poplawski <orion@cora.nwra.com> - 2.4.2-1 |
||||
- Update to 2.4.2 |
||||
|
||||
* Thu Apr 6 2006 Orion Poplawski <orion@cora.nwra.com> - 2.2.3-4 |
||||
- Update for vim 7.0c |
||||
|
||||
* Tue Mar 28 2006 Orion Poplawski <orion@cora.nwra.com> - 2.2.3-3 |
||||
- No subpackages, just own the emacs and vim dirs. |
||||
|
||||
* Tue Mar 21 2006 Orion Poplawski <orion@cora.nwra.com> - 2.2.3-2 |
||||
- Add emacs and vim support |
||||
- Include Example in docs |
||||
|
||||
* Wed Mar 8 2006 Orion Poplawski <orion@cora.nwra.com> - 2.2.3-1 |
||||
- Fedora Extras version |
Loading…
Reference in new issue