Fix mingw build.

Haivision · Dec 12, 2018 · ee41d82 · ee41d82
1 parent d783f2e
commit ee41d82
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -41,13 +41,16 @@ matrix:
             - ./Configure --cross-compile-prefix=x86_64-w64-mingw32- mingw64
             - make
             - cd ..
-            - export OPENSSL_ROOT_DIR="$PWD/openssl"
-            - export CMAKE_SYSTEM_NAME="Windows"
-            - export CC="x86_64-w64-mingw32-gcc"
-            - export CXX="x86_64-w64-mingw32-g++"
           env: BUILD_TYPE=Release
 script:
-    - if [ "$TRAVIS_OS_NAME" == "linux" ]; then cmake . -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DENABLE_UNITTESTS="ON" -DOPENSSL_ROOT_DIR="$OPENSSL_ROOT_DIR" -DCMAKE_SYSTEM_NAME="$CMAKE_SYSTEM_NAME"; fi
-    - if [ "$TRAVIS_OS_NAME" == "osx" ];   then cmake . -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DENABLE_UNITTESTS="ON" -DCMAKE_PREFIX_PATH=/usr/local/opt/openssl; fi
+    - if [ "$TRAVIS_COMPILER" == "x86_64-w64-mingw32-g++" ]; then
+        export CC="x86_64-w64-mingw32-gcc";
+        export CXX="x86_64-w64-mingw32-g++";
+        cmake . -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DENABLE_UNITTESTS="ON" -DUSE_OPENSSL_PC="OFF" -DOPENSSL_ROOT_DIR="$PWD/openssl" -DCMAKE_SYSTEM_NAME="Windows";
+      elif [ "$TRAVIS_OS_NAME" == "linux" ]; then
+        cmake . -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DENABLE_UNITTESTS="ON";
+      elif [ "$TRAVIS_OS_NAME" == "osx" ]; then
+        cmake . -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DENABLE_UNITTESTS="ON" -DCMAKE_PREFIX_PATH=/usr/local/opt/openssl;
+      fi
     - make
     - if [ "$TRAVIS_COMPILER" != "x86_64-w64-mingw32-g++" ]; then ctest --extra-verbose; fi