Skip to content

Commit

Permalink
Merge branch 'development' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
baperry2 authored Jul 22, 2024
2 parents f7dc41d + 989b9de commit 85bdec5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 14 deletions.
7 changes: 3 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
############################ BASE ######################################

cmake_minimum_required (VERSION 3.14 FATAL_ERROR)
cmake_minimum_required (VERSION 3.23 FATAL_ERROR)
project(PeleC CXX)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
include(CMakePackageConfigHelpers)
include(PeleUtils)
enable_testing()
include(CTest)

########################## OPTIONS #####################################

Expand Down Expand Up @@ -121,7 +123,4 @@ init_code_checks()
include(SetRpath)

add_subdirectory(Exec)

enable_testing()
include(CTest)
add_subdirectory(Tests)
11 changes: 1 addition & 10 deletions CTestConfig.cmake
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
## This file should be placed in the root directory of your project.
## Then modify the CMakeLists.txt file in the root directory of your
## project to incorporate the testing dashboard.
##
## # The following are required to submit to the CDash dashboard:
## ENABLE_TESTING()
## INCLUDE(CTest)

set(CTEST_PROJECT_NAME "PeleC")
set(CTEST_NIGHTLY_START_TIME "00:00:00 EDT")

set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "my.cdash.org")
set(CTEST_DROP_LOCATION "/submit.php?project=PeleC")
set(CTEST_DROP_LOCATION "/submit.php?project=Pele")
set(CTEST_DROP_SITE_CDASH TRUE)

0 comments on commit 85bdec5

Please sign in to comment.