- Try approach from upstream sdk scripts
This commit is contained in:
		@@ -24,9 +24,10 @@ cmake_minimum_required(VERSION 2.8.9)
 | 
			
		||||
set (ubuntu_sdk_VERSION_MAJOR 3)
 | 
			
		||||
set (ubuntu_sdk_VERSION_MINOR 5)
 | 
			
		||||
 | 
			
		||||
set (QT_VERSION      "qt-everywhere-opensource-src-5.4.2")
 | 
			
		||||
set (QT_SOURCE_DIR   "${CMAKE_BINARY_DIR}/qt-build/qt-everywhere-opensource-src-5.4.2")
 | 
			
		||||
set (QT_KIT_SOURCE_DIR   "${CMAKE_BINARY_DIR}/qt-build/qt-everywhere-opensource-src-ubuntu")
 | 
			
		||||
set (QT_VERSION          "qt-everywhere-opensource-src-5.4.2")
 | 
			
		||||
set (QT_SOURCE_DIR       "${CMAKE_BINARY_DIR}/qt-build/qt-everywhere-opensource-src-5.4.2")
 | 
			
		||||
set (QT_KIT_PREFIX       "${CMAKE_BINARY_DIR}/qt-api-build")
 | 
			
		||||
set (QT_KIT_SOURCE_DIR   "${QT_KIT_PREFIX}/qt-everywhere-opensource-src-ubuntu")
 | 
			
		||||
set (QT_BUILD_DIR    "${CMAKE_BINARY_DIR}/qt-build/build")
 | 
			
		||||
set (QT_INSTALL_DIR  "${CMAKE_BINARY_DIR}/qt")
 | 
			
		||||
 | 
			
		||||
@@ -135,7 +136,14 @@ ExternalProject_Add(qtcreator_plugin_autopilot
 | 
			
		||||
  INSTALL_COMMAND   sh -c "exit 0"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
SET (QT_KIT_PREFIX "${CMAKE_BINARY_DIR}/qt-api-build")
 | 
			
		||||
 | 
			
		||||
ConcatStrings(QT_KIT_INSTALL_SCRIPT
 | 
			
		||||
  "make qmake_all "
 | 
			
		||||
  "&& make INSTALL_ROOT=${QT_KIT_PREFIX}/qt install "
 | 
			
		||||
  "&& make INSTALL_ROOT=${QT_KIT_PREFIX}/qt docs -j1 "
 | 
			
		||||
  "&& make INSTALL_ROOT=${QT_KIT_PREFIX}/qt install_docs -j1"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
ExternalProject_Add(${QT_VERSION}-api
 | 
			
		||||
  PREFIX      "${QT_KIT_PREFIX}"
 | 
			
		||||
  SOURCE_DIR  "${QT_KIT_SOURCE_DIR}"
 | 
			
		||||
@@ -145,8 +153,8 @@ ExternalProject_Add(${QT_VERSION}-api
 | 
			
		||||
  UPDATE_COMMAND    sh -c "exit 0" #nothing to update
 | 
			
		||||
  PATCH_COMMAND     sh -c "cp ${CMAKE_SOURCE_DIR}/desktop_kit_qt.pro ${QT_KIT_SOURCE_DIR}/qt.pro && cp ${CMAKE_SOURCE_DIR}/desktop_kit_configure ${QT_KIT_SOURCE_DIR}/configure"
 | 
			
		||||
  CONFIGURE_COMMAND sh -c "${QT_KIT_SOURCE_DIR}/configure -prefix /usr/ubuntu-sdk-dev `cat ${CMAKE_SOURCE_DIR}/kit_config`"
 | 
			
		||||
  BUILD_COMMAND     sh -c "make ${GENERATED_MAKE_FLAGS} && make docs -j1"
 | 
			
		||||
  INSTALL_COMMAND   sh -c "make INSTALL_ROOT=${QT_KIT_PREFIX}/qt install && make INSTALL_ROOT=${QT_KIT_PREFIX}/qt install_docs"
 | 
			
		||||
  BUILD_COMMAND     sh -c "make ${GENERATED_MAKE_FLAGS}"
 | 
			
		||||
  INSTALL_COMMAND   sh -c "${QT_KIT_INSTALL_SCRIPT}"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user