pool/cmake
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Remove cmake-prefix-swig.patch as it caused unexpected regressions

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=195
This commit is contained in:
Tomáš Chvátal 2015-02-16 14:59:38 +00:00 committed by Git OBS Bridge
parent 386a324d94
commit f30af33be4
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmake-prefix-swig.patch
View File

@ -1,13 +0,0 @@
Index: cmake-3.1.0/Modules/UseSWIG.cmake
===================================================================
--- cmake-3.1.0.orig/Modules/UseSWIG.cmake
+++ cmake-3.1.0/Modules/UseSWIG.cmake
@@ -260,7 +260,7 @@ macro(SWIG_ADD_MODULE name language)
set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "")
elseif ("${swig_lowercase_language}" STREQUAL "python")
# this is only needed for the python case where a _modulename.so is generated
- set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "")
+ set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "_")
# Python extension modules on Windows must have the extension ".pyd"
# instead of ".dll" as of Python 2.5. Older python versions do support
# this suffix.

5
cmake.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Feb 16 14:59:01 UTC 2015 - tchvatal@suse.com
- Remove cmake-prefix-swig.patch as it caused unexpected regressions
-------------------------------------------------------------------
Sat Feb 14 19:48:11 UTC 2015 - hrvoje.senjan@gmail.com

2
cmake.spec
View File

@ -28,8 +28,6 @@ Source0: http://www.cmake.org/files/v3.2/%{name}-%{rversion}.tar.gz
Source1: cmake.macros
Source2: opensuse_rules.cmake
Patch2: cmake-fix-ruby-test.patch
# PATCH-FIX-OPENSUSE: bnc#874885 contain the python swig namespace
Patch3: cmake-prefix-swig.patch
# PATCH-FIX-UPSTREAM form.patch -- set the correct include path for the ncurses includes
Patch4: form.patch
# PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs