Ubuntu Pastebin

Paste from shadeslayer at Sat, 13 Jun 2015 00:13:59 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
--- debian/patches/ubuntu_cmake-crosscompile.patch	2015-05-29 11:22:23.000000000 +0200
+++ /tmp/ubuntu_cmake-crosscompile.patch	2015-06-13 02:13:05.164808842 +0200
@@ -15,6 +15,7 @@
 +  # cross-compilation on debian systems out of the box
 +  if(EXISTS "/etc/debian_version")
 +    include(${CMAKE_ROOT}/Modules/MultiArchCross.cmake OPTIONAL RESULT_VARIABLE _INCLUDED_MULTIARCH_TOOLCHAIN_FILE)
++    set(CMAKE_TOOLCHAIN_FILE "${CMAKE_ROOT}/Modules/MultiArchCross.cmake" CACHE FILEPATH "The CMake toolchain file" FORCE)
 +  endif()
  endif()
  
@@ -38,7 +39,7 @@
 ===================================================================
 --- cmake-3.0.2.orig/Modules/FindPkgConfig.cmake
 +++ cmake-3.0.2/Modules/FindPkgConfig.cmake
-@@ -30,6 +30,10 @@
+@@ -150,6 +150,10 @@
  ### Common stuff ####
  set(PKG_CONFIG_VERSION 1)
  
@@ -46,14 +47,14 @@
 +  include(${CMAKE_ROOT}/Modules/MultiArchCross.cmake OPTIONAL RESULT_VARIABLE _INCLUDED_MULTIARCH_TOOLCHAIN_FILE)
 +endif()
 +
- # find pkg-config, use PKG_CONFIG if set
- if((NOT PKG_CONFIG_EXECUTABLE) AND (NOT "$ENV{PKG_CONFIG}" STREQUAL ""))
-   set(PKG_CONFIG_EXECUTABLE "$ENV{PKG_CONFIG}" CACHE FILEPATH "pkg-config executable")
+ find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
+ mark_as_advanced(PKG_CONFIG_EXECUTABLE)
+ 
 Index: cmake-3.0.2/Modules/GNUInstallDirs.cmake
 ===================================================================
 --- cmake-3.0.2.orig/Modules/GNUInstallDirs.cmake
 +++ cmake-3.0.2/Modules/GNUInstallDirs.cmake
-@@ -72,6 +72,10 @@
+@@ -61,6 +61,10 @@
  
  # Installation directories
  #
@@ -68,7 +69,7 @@
 ===================================================================
 --- cmake-3.0.2.orig/Modules/AutogenInfo.cmake.in
 +++ cmake-3.0.2/Modules/AutogenInfo.cmake.in
-@@ -13,6 +13,9 @@ set(AM_CMAKE_SOURCE_DIR "@CMAKE_SOURCE_D
+@@ -12,6 +12,9 @@ set(AM_CMAKE_SOURCE_DIR "@CMAKE_SOURCE_D
  set(AM_QT_MOC_EXECUTABLE "@_qt_moc_executable@")
  set(AM_QT_UIC_EXECUTABLE "@_qt_uic_executable@")
  set(AM_QT_RCC_EXECUTABLE "@_qt_rcc_executable@")
@@ -77,4 +78,4 @@
 +endif()
  set(AM_CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@/")
  set(AM_CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@/")
- set(AM_QT_VERSION_MAJOR "@_target_qt_version@")
+ set(AM_QT_VERSION_MAJOR "@_target_qt_version@")
\ No newline at end of file
Download as text