From 5430222e268e86e40454a7ca853c4a3ff287f3ab Mon Sep 17 00:00:00 2001 From: Sam Stevens Date: Wed, 4 Dec 2019 21:51:20 +0000 Subject: [PATCH] Set outputs to use bin dir --- .gitignore | 7 ++++++- .gitlab-ci.yml | 4 ++-- .idea/deployment.xml | 14 ++++++++++++++ CMakeLists.txt | 3 +++ 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 .idea/deployment.xml diff --git a/.gitignore b/.gitignore index 0dfa05a..4590b9d 100644 --- a/.gitignore +++ b/.gitignore @@ -78,4 +78,9 @@ CTestTestfile.cmake build -# End of https://www.gitignore.io/api/cmake,clion \ No newline at end of file +# End of https://www.gitignore.io/api/cmake,clion + +# binary files +/bin/ +# Codeblocks project +/SDB.cbp diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1db8a75..517794e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,11 +18,11 @@ job_build: name: SDB Linux expire_in: 1 week paths: - - src/SDB + - bin/SDB job_test: stage: test script: - cmake . - make check_SDB - - ./tests/check_SDB \ No newline at end of file + - ./bin/check_SDB \ No newline at end of file diff --git a/.idea/deployment.xml b/.idea/deployment.xml new file mode 100644 index 0000000..69df951 --- /dev/null +++ b/.idea/deployment.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index fea69c6..e17fc5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,9 @@ cmake_minimum_required(VERSION 3.9) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/bin") +set(LIBRARY_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/bin") + project(SDB C) set(CMAKE_C_STANDARD 11)