Lubuntu/cmake
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FindJNI patch: avoid using trick bits of cmake IF() command syntax.

Browse Source 
This should fix FindJNI on architectures which do not need special
CMAKE_SYSTEM_PROCESSOR handling (e.g. ia64).
This commit is contained in:
Modestas Vainius 2010-05-29 02:48:05 +03:00
parent 25b74ab247
commit 507469c7bf
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -6,6 +6,9 @@ cmake (2.8.1-5) UNRELEASED; urgency=low
[ Modestas Vainius ]
* Add procps to Build-Depends and cmake Depends. cmake sometimes uses ps
binary.
* FindJNI patch: avoid using trick bits of cmake IF() command syntax.
This should fix FindJNI on architectures which do not need special
CMAKE_SYSTEM_PROCESSOR handling (e.g. ia64).
-- Kai Wasserbäch <debian@carbon-project.org> Thu, 27 May 2010 00:56:35 +0200

2
debian/patches/FindJNI_fix_libarch_determination.diff vendored
View File

@ -67,7 +67,7 @@ Last-Update: 2010-05-17
+ SET(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "s390" "s390x")
+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sh")
+ SET(_java_libarch "sh")
+ ELSEIF("${CMAKE_SYSTEM_PROCESSOR}")
+ ELSE(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+ SET(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}")
+ ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+