From ef9229198be21007d54c60525800bd65c9721760 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 12 Apr 2022 11:12:50 +0800 Subject: [PATCH] debug --- CMakeLists.txt | 2 +- docker/Dockerfile.satellite | 5 +++-- framework/CMakeLists.txt | 2 +- modules/CMakeLists.txt | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c8d350..70fba44 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ if(" ${CMAKE_SOURCE_DIR}" STREQUAL " ${CMAKE_BINARY_DIR}") message(FATAL_ERROR "Please create a separate directory for build files.") endif() -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.5.1) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") diff --git a/docker/Dockerfile.satellite b/docker/Dockerfile.satellite index 46d0452..9bd759c 100644 --- a/docker/Dockerfile.satellite +++ b/docker/Dockerfile.satellite @@ -12,8 +12,9 @@ RUN apt-get update && \ libgoogle-glog-dev \ libsqlite3-dev \ sqlite3 \ - uuid-dev - + uuid-dev \ + git + # 拷贝文件 COPY ./3rdparty/ZLToolKit.tar.gz /root diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt index 4dc6709..5d064a5 100644 --- a/framework/CMakeLists.txt +++ b/framework/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.5.1) set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib/) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin/) set(INS_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..) diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 12b9697..d3b5795 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.5.1) set(INS_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..) set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib/)