From 10c3a0ba1c3712c085a8028508f51e0c595034f4 Mon Sep 17 00:00:00 2001 From: Joseph Walton-Rivers <joseph@walton-rivers.uk> Date: Fri, 17 Dec 2021 17:44:29 +0000 Subject: [PATCH] unify build folders --- build.sh | 12 ++++++------ fggl/CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.sh b/build.sh index d6d7f38..7fafd56 100755 --- a/build.sh +++ b/build.sh @@ -2,11 +2,11 @@ CACHE=/tmp/fggl/ LOG=$CACHE/demo.log -EXE="../build/demo/FgglDemo" +EXE="../builds/cli/demo/FgglDemo" -if [[ ! -d "build/" ]] +if [[ ! -d "builds/cli/" ]] then - mkdir build + mkdir -p builds/cli fi if [ ! -x "$(command -v cmake)" ]; then @@ -21,8 +21,8 @@ rm -rf $CACHE # # build step # -pushd build -cmake .. +pushd builds/cli +cmake ../.. make popd @@ -41,5 +41,5 @@ if [ -x "$(command -v mangohud)" ]; then fi pushd demo -$EXE ../build/demo/FgglDemo +$EXE popd diff --git a/fggl/CMakeLists.txt b/fggl/CMakeLists.txt index a530736..838c36e 100644 --- a/fggl/CMakeLists.txt +++ b/fggl/CMakeLists.txt @@ -2,7 +2,7 @@ configure_file(FgglConfig.h.in FgglConfig.h) find_program(CLANG_TIDY_FOUND clang-tidy) if ( CLANG_TIDY_FOUND ) - set(CMAKE_CXX_CLANG_TIDY clang-tidy -checks=*,-llvmlibc-*,-fuchsia-*,-cppcoreguidelines-*,-llvm-*) + set(CMAKE_CXX_CLANG_TIDY clang-tidy -checks=*,-llvmlibc-*,-fuchsia-*,-cppcoreguidelines-*,-android-*,-llvm-*,-altera-*) endif() add_library(fggl fggl.cpp -- GitLab