From 00698c9d48ac75937dc15c94617fe7a12f7bd0a7 Mon Sep 17 00:00:00 2001 From: ClausKlein Date: Thu, 31 Aug 2023 07:17:26 +0200 Subject: [PATCH] Install with pip -U --- .github/workflows/cmake.yml | 4 ++-- CMakeLists.txt | 5 ++++- GNUmakefile | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index f050c88..b381e71 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -45,13 +45,13 @@ jobs: - run: | sudo python -m pip install --upgrade pip - sudo pip install -r requirements.txt + sudo pip install -U -r requirements.txt - name: Setup Cpp if: startsWith(matrix.os, 'ubuntu') uses: aminya/setup-cpp@v1 with: - llvm: true + gcc: true ccache: true clangtidy: true clangformat: true diff --git a/CMakeLists.txt b/CMakeLists.txt index 55a6ed7..61ea740 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -157,7 +157,10 @@ if(NETKIT_TFTP_TESTS) add_executable(option_test option_test.cpp async_tftpd_server.hpp) target_link_libraries(option_test PRIVATE tftpd) - # FIXME add_test(NAME option_test COMMAND option_test) + + if(APPLE) + add_test(NAME option_test COMMAND option_test) + endif() add_executable(tftpd_test tftpd_test.cpp async_tftpd_server.hpp) target_link_libraries(tftpd_test PRIVATE tftpd) diff --git a/GNUmakefile b/GNUmakefile index 974a664..6e7c10b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -22,8 +22,8 @@ PROJECT_NAME:=$(shell basename $${PWD}) # prevent hard config of find_package(asio 1.14.1 CONFIG CMAKE_FIND_ROOT_PATH_BOTH) ifeq (NO${CROSS_COMPILE},NO) ifeq (${UNAME},Darwin) - #TODO CC:=/usr/local/opt/llvm/bin/clang - #TODO CXX:=/usr/local/opt/llvm/bin/clang++ + CC:=/usr/bin/gcc + CXX:=/usr/bin/g++ BOOST_ROOT:=/usr/local/opt/boost export BOOST_ROOT endif @@ -44,7 +44,7 @@ endif #NO! BUILD_TYPE=Coverage make lcov BUILD_TYPE?=Debug BUILD_TYPE?=Release -# GENERATOR:=Xcode +GENERATOR:=Xcode GENERATOR?=Ninja # end of config part