More experiments with the macOS build.

Exiv2 · Aug 7, 2021 · df24277 · df24277
1 parent 3ff860b
commit df24277
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/.github/workflows/on_PR_mac_matrix.yml b/.github/workflows/on_PR_mac_matrix.yml
@@ -19,12 +19,19 @@ jobs:
       - name: install dependencies
         run: |
           brew install ninja
-          brew install googletest
+          pushd /tmp
+          curl -LO https://github.com/google/googletest/archive/release-1.8.0.tar.gz
+          tar xzf   release-1.8.0.tar.gz
+          mkdir -p  googletest-release-1.8.0/build
+          pushd     googletest-release-1.8.0/build
+          cmake .. ; make ; make install
+          popd
+          popd
 
       - name: Build
         run: |
           mkdir build && cd build
-          cmake -GNinja -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBUILD_SHARED_LIBS=${{matrix.shared_libraries}} -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_ENABLE_CURL=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_BMFF=OFF -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DCMAKE_INSTALL_PREFIX=install -DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" -DCMAKE_CXX_STANDARD=11 ..
+          cmake -GNinja -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBUILD_SHARED_LIBS=${{matrix.shared_libraries}} -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_ENABLE_CURL=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_BMFF=OFF -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DCMAKE_INSTALL_PREFIX=install -DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" ..
           cmake --build .
 
       - name: Install

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -59,18 +59,6 @@ jobs:
       - name: Install dependencies
         run: |
           brew install ninja
-          brew install tree
-          brew install gettext
-          pip3 install conan==1.36.0
-
-      - name: Run Conan
-        run: |
-          mkdir build && cd build
-          conan profile new --detect default
-          conan profile show default
-          conan install .. -o webready=False --build missing
-          # Hack: Delete cmake_find_package generated files to fix compilation on mac.
-          rm Find*
 
       - name: Build packaged release
         run: |