adding include path as H5CC build fails because it cant find stdio.h

ess-dmsc · Mar 24, 2022 · 68ff106 · 68ff106
1 parent 0846b1d
commit 68ff106
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -51,7 +51,7 @@ def get_macos_pipeline() {
                     try {
                         // Remove existing CLI11 because of case insensitive filesystem issue
                         sh "conan remove -f 'CLI11*' && \
-                            CFLAGS='-isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk -Wno-error=implicit-function-declaration' cmake ../code"
+                            CFLAGS='-isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk -I/Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk/usr/include -Wno-error=implicit-function-declaration' cmake ../code"
                     } catch (e) {
                         failure_function(e, 'MacOSX / CMake failed')
                     }

diff --git a/conanfile.txt b/conanfile.txt
@@ -1,13 +1,17 @@
 [requires]
-cli11/2.1.1      #bump to 2.1.2 requires conan upgrade
+
+# 3'rd party utils and libraries
+cli11/2.1.2      #bump to 2.1.2 requires conan upgrade
 date/3.0.1
-eigen/3.3.9      #bump to 3.4.0 requires conan upgrade
+eigen/3.4.0      #bump to 3.4.0 requires conan upgrade
+fmt/8.1.1        #bump to 8.1.1 requires upgrade of spdlog as well
 gtest/1.10.0
-fmt/6.2.0        #bump to 8.1.1 requires upgrade of spdlog as well
-librdkafka/1.6.0 #bump to 1.8.2 requires conan upgrade
-nlohmann_json/3.10.5
-spdlog/1.8.5     #bump to 1.9.2 requires conan upgrade
 h5cpp/0.4.1@ess-dmsc/stable
+librdkafka/1.8.2 #bump to 1.8.2 requires conan upgrade
+nlohmann_json/3.10.5
+spdlog/1.9.2     #bump to 1.9.2 requires conan upgrade
+
+# ESS code
 logical-geometry/705ea61@ess-dmsc/stable
 qplot/6e192ab@ess-dmsc/stable
 Qt-Color-Widgets/9f4e052@ess-dmsc/stable