From 397df45c60f2041e5c5db25aa86d8da1d670cda2 Mon Sep 17 00:00:00 2001 From: Robert Ulmer Date: Thu, 26 Sep 2024 21:55:33 +0200 Subject: [PATCH] fix --- CMakeLists.txt | 3 +-- build.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a89ff14..e701350 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,6 @@ ENDFUNCTION() FUNCTION(ADD_DEPS target_directory) IF(EXISTS ${target_directory}/deps.txt) GET_FILENAME_COMPONENT(target_name ${target_directory} NAME) - # ADD_DEPENDENCIES(${target_name} ${target_directory}/deps.txt) FILE(READ ${target_directory}/deps.txt dependencies) STRING(REPLACE "\n" ";" dependencies ${dependencies}) FOREACH(dependency ${dependencies}) @@ -97,7 +96,7 @@ FOREACH(test_type_dir ${test_types}) ENDFOREACH() ELSEIF(${test_type} MATCHES criterion) FIND_LIBRARY(lib_criterion criterion) - FILE(GLOB criterion_sources ${test_target_dir}/*.cpp) + FILE(GLOB criterion_sources ${test_target_dir}/*.cpp ${test_target_dir}/*.c) ADD_EXECUTABLE(${test_target} EXCLUDE_FROM_ALL ${criterion_sources} ) TARGET_LINK_LIBRARIES(${test_target} ${lib_criterion}) ADD_DEPS(${test_target_dir}) diff --git a/build.sh b/build.sh index 4a44a74..5cb1fc2 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash fail() { exit_code=$1