Browse Source

debug

master
Your Name 3 years ago
parent
commit
ef9229198b
  1. 2
      CMakeLists.txt
  2. 5
      docker/Dockerfile.satellite
  3. 2
      framework/CMakeLists.txt
  4. 2
      modules/CMakeLists.txt

2
CMakeLists.txt

@ -2,7 +2,7 @@ if(" ${CMAKE_SOURCE_DIR}" STREQUAL " ${CMAKE_BINARY_DIR}") @@ -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")

5
docker/Dockerfile.satellite

@ -12,8 +12,9 @@ RUN apt-get update && \ @@ -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

2
framework/CMakeLists.txt

@ -1,4 +1,4 @@ @@ -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}/..)

2
modules/CMakeLists.txt

@ -1,4 +1,4 @@ @@ -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/)

Loading…
Cancel
Save