From 8863c2ff2a59e9d5b34cba3705b486ff0d118809 Mon Sep 17 00:00:00 2001 From: huangsimin Date: Wed, 1 Apr 2020 10:26:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0:=20=E6=9B=B4=E5=A5=BD?= =?UTF-8?q?=E7=9A=84=E8=B0=83=E8=AF=95=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/launch.json | 2 +- .vscode/tasks.json | 6 +++--- CMakeLists.txt | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 7293596..60d183b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -29,7 +29,7 @@ "name": "(gdb) gtest bug", "type": "cppdbg", "request": "launch", - "program": "${workspaceFolder}/gtest/build/vbt_test", + "program": "${fileDirname}/build/${fileBasenameNoExtension}", "args": [], "stopAtEntry": false, "cwd": "${workspaceFolder}", diff --git a/.vscode/tasks.json b/.vscode/tasks.json index f21deaf..64de7b9 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -6,7 +6,7 @@ { "type": "shell", "label": "cmake main debug", - "command": "/usr/bin/bash", + "command": "bash", "args": [ "-c", "cd ${workspaceFolder}/build && cmake .. -DCMAKE_BUILD_TYPE=Debug && make -j4", @@ -22,10 +22,10 @@ { "type": "shell", "label": "cmake test debug", - "command": "/usr/bin/bash", + "command": "bash", "args": [ "-c", - "cd ${workspaceFolder}/gtest && mkdir -p build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Debug && make -j4", + "cd ${fileDirname} && mkdir -p build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Debug && make -j4", ], "options": { "cwd": "/bin" diff --git a/CMakeLists.txt b/CMakeLists.txt index d70ecda..634a4cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,12 @@ -cmake_minimum_required(VERSION 3.5.0) +cmake_minimum_required(VERSION 3.0.0) project(orderly VERSION 0.1.0) SET(CMAKE_BUILD_TYPE "Debug") SET(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -O0 -Wall -g2 -ggdb") SET(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -O3 -Wall") -include(CTest) -enable_testing() +# include(CTest) +# enable_testing() include_directories( ${CMAKE_CURRENT_LIST_DIR}/src