diff --git a/CMakeLists.txt b/CMakeLists.txt index df8ff8d1..82a2b78c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,9 +8,46 @@ set(pip_SUFFIX ) set(pip_COMPANY SHS) set(pip_DOMAIN org.SHS) +set(GIT_CMAKE_DIR) +if (NOT DEFINED SHSTKPROJECT) + set(ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}") + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cmake-download/CMakeLists.txt" +"# This file was generated by PIP CMake, don`t edit it! +cmake_minimum_required(VERSION 2.8.2) +project(cmake-download NONE) +include(ExternalProject) +ExternalProject_Add(cmake + GIT_REPOSITORY https://git.shs.tools/SHS/cmake.git + GIT_TAG \"origin/master\" + GIT_CONFIG \"advice.detachedHead=false\" + SOURCE_DIR \"${CMAKE_CURRENT_BINARY_DIR}/cmake-src\" + BINARY_DIR \"${CMAKE_CURRENT_BINARY_DIR}/cmake-build\" + INSTALL_COMMAND \"\" + TEST_COMMAND \"\" +) +") + execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . + RESULT_VARIABLE result + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cmake-download) + if(result) + message(FATAL_ERROR "CMake step for cmake failed: ${result}") + endif() + execute_process(COMMAND ${CMAKE_COMMAND} --build . + RESULT_VARIABLE result + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cmake-download) + if(result) + message(FATAL_ERROR "Build step for cmake failed: ${result}") + endif() + install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} --build \"${CMAKE_CURRENT_BINARY_DIR}/cmake-build\" --target install)") + set(GIT_CMAKE_DIR "${CMAKE_CURRENT_BINARY_DIR}/cmake-src") +endif() + if ("x${CMAKE_MODULE_PATH}" STREQUAL "x") set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") endif() +if (NOT "x${GIT_CMAKE_DIR}" STREQUAL "x") + list(APPEND CMAKE_MODULE_PATH "${GIT_CMAKE_DIR}") +endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include(CheckFunctionExists) include(PIPMacros) diff --git a/utils/cloud_dispatcher/CMakeLists.txt b/utils/cloud_dispatcher/CMakeLists.txt index 4db22a31..844de667 100644 --- a/utils/cloud_dispatcher/CMakeLists.txt +++ b/utils/cloud_dispatcher/CMakeLists.txt @@ -20,7 +20,7 @@ endif() if (NOT DEFINED ANDROID_PLATFORM) deploy_target(${PROJECT_NAME} DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR} - DESTINATION ${ROOT_DIR}/release + DESTINATION "${ROOT_DIR}/release" DEB_ADD_SERVICE ADD_MANIFEST )