IAP GITLAB

Skip to content

GitLab

C
cxroot
Commit c9cad675 authored by Ralf Ulrich's avatar Ralf Ulrich ☄
Browse files
Options

Merge branch 'master' into 'cmake_export' 

# Conflicts:
#   CMakeLists.txt
parents 2d71ee13 18021520
Pipeline #3284 failed with stage
    in 47 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 3 additions and 3 deletions
    Makefile
    View file @ c9cad675
    ......@@ -95,9 +95,9 @@ endif
    LDFLAGS += -lbz2
    SOFLAGS += -lbz2
    ifneq ("$(BZIP2_INCLUDE_DIR)", "")
    CXXFLAGS += -I${BZIP2_INCLUDE_DIR}
    endif ()
    ifneq ("x$(BZIP2_INCLUDE_DIRS)", "x")
    CXXFLAGS += -I${BZIP2_INCLUDE_DIRS}
    endif
    CXXFLAGS += -std=c++17 -I$(TABDIR)/readLib/externals/compress_stream/include
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment

    mailto ikp-admins [at] lists [dot] kit [dot] edu