From dbcd866aa9efc08f12e18273f22408c6c4f33e9f Mon Sep 17 00:00:00 2001 From: Krad Date: Wed, 8 Dec 2021 15:10:02 +0800 Subject: [PATCH] Compile logic change --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cfe7990..577c597 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8) set(PROJECT_NAME GUI) project(${PROJECT_NAME}) -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 14) set(CMAKE_INCLUDE_CURRENT_DIR ON) #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2 -pthread") @@ -10,7 +10,11 @@ file(GLOB_RECURSE project_cpps ./src/*.cpp) file(GLOB_RECURSE project_cxx ./src/*.cxx) file(GLOB_RECURSE project_cc ./src/*.cc) +if(UNIX) +set(USE_SHIMLIB ON) +else() set(USE_SHIMLIB OFF) +endif() if(UNIX AND USE_SHIMLIB) file(GLOB_RECURSE project_c ./src/json/*.c) else() @@ -53,6 +57,7 @@ if(UNIX) # copy project reference file install(CODE "file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/testdata/img1_v2.bin DESTINATION ${CMAKE_INSTALL_BINDIR})") install(CODE "file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/testdata/img2_v2.bin DESTINATION ${CMAKE_INSTALL_BINDIR})") + install(CODE "file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/cfgs DESTINATION ${CMAKE_INSTALL_BINDIR})") install(CODE "file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/scripts/GUI.sh DESTINATION ${CMAKE_INSTALL_BINDIR})") install(CODE "file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/layouts DESTINATION ${CMAKE_INSTALL_BINDIR})") # copy reference libs