From aabe4ec8215cbc1b3445d291a0a943cf81ca4006 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 27 Jul 2020 13:29:55 -0600 Subject: [PATCH] try again --- .travis.yml | 3 +-- src/clib/CMakeLists.txt | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0726c6250ac..2072398dae2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,8 +51,7 @@ script: - rm -rf build - mkdir build - cd build - - unset CFLAGS FFLAGS FCFLAGS DISTCHECK_CONFIGURE_FLAGS - cmake -DPIO_HDF5_LOGGING=On -DPIO_USE_MALLOC=On -DPIO_ENABLE_LOGGING=On -DPIO_ENABLE_TIMING=Off .. - make VERBOSE=1 - make tests VERBOSE=1 - - make test VERBOSE=1 \ No newline at end of file + - ctest -VV \ No newline at end of file diff --git a/src/clib/CMakeLists.txt b/src/clib/CMakeLists.txt index 3c8be4349b6..edf1aa89e0d 100644 --- a/src/clib/CMakeLists.txt +++ b/src/clib/CMakeLists.txt @@ -29,13 +29,13 @@ target_compile_definitions (pioc # Compiler-specific compiler options if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") - list(INSERT CMAKE_C_FLAGS 0 "-std=c99 ") + string(PREPEND CMAKE_C_FLAGS "-std=c99 " ) elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "PGI") - list(INSERT CMAKE_C_FLAGS 0 "-c99 ") + string(PREPEND CMAKE_C_FLAGS "-c99 ") elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "Intel") - list(INSERT CMAKE_C_FLAGS 0 "-std=c99 -debug minimal") + string(PREPEND CMAKE_C_FLAGS "-std=c99 -debug minimal ") elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") - list(INSERT CMAKE_C_FLAGS 0 "-std=c99 ") + string(PREPEND CMAKE_C_FLAGS "-std=c99 ") endif() target_compile_options (pioc PRIVATE ${CMAKE_C_FLAGS})