Raise OPM Version to 2020.10-rc5

Merge pull request #2094 from OPM/backport-of-pr-2093
workaround cmake issue
2020-11-06 11:28:43 +01:00 · 2020-11-06 11:26:05 +01:00 · 2020-11-06 11:23:10 +01:00 · 2020-10-30 17:16:52 +01:00
2 changed files with 4 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,8 +76,9 @@ macro (config_hook)

    # For this project
    add_definitions(-DFMT_HEADER_ONLY)
-    list(APPEND EXTRA_INCLUDES SYSTEM ${PROJECT_SOURCE_DIR}/external/fmtlib/include)
+    include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/external/fmtlib/include)
    include_directories(${EXTRA_INCLUDES} ${PROJECT_BINARY_DIR}/include)
+    list(APPEND EXTRA_INCLUDES ${PROJECT_SOURCE_DIR}/external/fmtlib/include)

    # For downstreams
    list(APPEND EXTRA_INCLUDES ${PROJECT_BINARY_DIR}/include)
--- a/dune.module
+++ b/dune.module
@@ -5,8 +5,8 @@

 Module: opm-common
 Description: Open Porous Media Initiative shared infrastructure
-Version: 2020.10-rc3
-Label: 2020.10-rc3
+Version: 2020.10-rc5
+Label: 2020.10-rc5
 Maintainer: opm@opm-project.org
 MaintainerName: OPM community
 Url: http://opm-project.org
Author	SHA1	Message	Date
Bård Skaflestad	0a3557a727	Raise OPM Version to 2020.10-rc5	2020-11-06 11:28:43 +01:00
Bård Skaflestad	bf823a4fd4	Merge pull request #2094 from OPM/backport-of-pr-2093 workaround cmake issue	2020-11-06 11:26:05 +01:00
Arne Morten Kvarving	74b4287b6e	workaround cmake issue cmake does not properly interpret the SYSTEM marker in lists of include directories. this causes issues downstream when using dunecontrol / the in-tree cmake config files.	2020-11-06 11:23:10 +01:00
Bård Skaflestad	b99dc9b5ec	Raise OPM Version to 2020.10-rc4	2020-10-30 17:16:52 +01:00