diff --git a/Jenkinsfile b/Jenkinsfile index fb9a52fa3c4b95e0261b3f6df4fffb8063c63ceb..25b60dcb458817b2ecb0858bdc422010b21544d3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,7 +37,7 @@ builders['msvc'] = { builders['mac'] = { node('mac') { dir('ogs') { checkoutWithTags() } - load 'ogs/scripts/jenkins/mac.groovy' + // load 'ogs/scripts/jenkins/mac.groovy' } } diff --git a/conanfile.py b/conanfile.py index 0e7eeb448b437b562c21b7429c6ff09e573e86f3..5de4944298c1fe3bac2c840d99a64bb894fb300a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -20,7 +20,7 @@ class OpenGeoSysConan(ConanFile): def imports(self): self.copy(pattern="*.dll", dst="bin", src="bin") self.copy(pattern="*.dylib*", dst="bin", src="lib") - self.copy(pattern="*.framework*", dst="bin", src="lib") + # self.copy(pattern="*.framework*", dst="bin", src="lib") self.copy(pattern="*.dll", dst="bin/platforms", src="plugins/platforms") self.copy(pattern="*.dylib*", dst="bin/platforms", src="plugins/platforms")