Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Ulmer committed Sep 26, 2024
1 parent 2154f20 commit 397df45
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
#!/usr/bin/env bash

fail() {
exit_code=$1
Expand Down

0 comments on commit 397df45

Please sign in to comment.