BUG: disable the OpenH265 and x265 build on the CI, due to the depend…

…ency of the compiler version.
adamrankin · Aug 3, 2017 · 396aa70 · 396aa70
1 parent d543323
commit 396aa70
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -38,7 +38,7 @@ before_script:
   - cd    build
 
 script:
-  - cmake -DOpenIGTLink_PROTOCOL_VERSION_3=ON -DOpenIGTLink_SUPERBUILD=OFF -DBUILD_VIDEOSTREAM=ON -DUSE_X265=ON -DUSE_OPENHEVC=ON -DBUILD_TESTING=ON ..
+  - cmake -DOpenIGTLink_PROTOCOL_VERSION_3=ON -DOpenIGTLink_SUPERBUILD=OFF -DBUILD_VIDEOSTREAM=ON -DUSE_VP9=ON -DBUILD_TESTING=ON ..
   - make 
   - make test 
   #########################
@@ -51,7 +51,7 @@ script:
   - cd ..
   - mkdir SuperBuildTest
   - cd SuperBuildTest
-  - cmake -DOpenIGTLink_PROTOCOL_VERSION_3=ON -DOpenIGTLink_SUPERBUILD=ON -DBUILD_VIDEOSTREAM=ON -DUSE_X265=ON -DUSE_OPENHEVC=ON -DBUILD_TESTING=ON ..
+  - cmake -DOpenIGTLink_PROTOCOL_VERSION_3=ON -DOpenIGTLink_SUPERBUILD=ON -DBUILD_VIDEOSTREAM=ON -DUSE_VP9=ON -DBUILD_TESTING=ON ..
   - make
   - cd OpenIGTLink-bin
   - make test

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,8 +32,8 @@ ENDIF()
 OPTION(BUILD_VIDEOSTREAM "Build the Video Stream." ON)
 OPTION(USE_H264 "Link the OpenH264 tree." OFF)
 OPTION(USE_VP9 "Link the VP9 tree." OFF)
-OPTION(USE_X265 "Link the X265 tree." ON)
-OPTION(USE_OPENHEVC "Link the OpenHevc tree." ON)
+OPTION(USE_X265 "Link the X265 tree." OFF)
+OPTION(USE_OPENHEVC "Link the OpenHevc tree." OFF)
 SET(OpenIGTLink_LINK_H264 "0")
 SET(OpenIGTLink_LINK_VP9 "0")
 SET(OpenIGTLink_LINK_X265 "0")

diff --git a/appveyor.yml b/appveyor.yml
@@ -49,19 +49,7 @@ build_script:
 - ps: |
     mkdir build -Force | Out-Null
     cd build
-    & cmake -G "$generator" -DOpenIGTLink_PROTOCOL_VERSION_3=ON ..
-    if ($LastExitCode -ne 0) {
-        throw "Exec: $ErrorMessage"
-    }
-    & cmake --build . --config $env:CONFIGURATION
-    if ($LastExitCode -ne 0) {
-        throw "Exec: $ErrorMessage"
-    }
-    mkdir build -Force | Out-Null
-    cd ..
-    mkdir TestBuild
-    cd TestBuild
-    & cmake -G "$generator" -DCMAKE_PREFIX_PATH:PATH=..\build ..\Testing
+    & cmake -G "$generator" -DOpenIGTLink_PROTOCOL_VERSION_3=ON -DOpenIGTLink_SUPERBUILD=OFF ..
     if ($LastExitCode -ne 0) {
         throw "Exec: $ErrorMessage"
     }
@@ -73,17 +61,7 @@ build_script:
     if ($LastExitCode -ne 0) {
         throw "Exec: $ErrorMessage"
     }
-    cd ..\build
-    & cmake -G "$generator" -DOpenIGTLink_PROTOCOL_VERSION_3=OFF ..
-    if ($LastExitCode -ne 0) {
-        throw "Exec: $ErrorMessage"
-    }
-    & cmake --build . --config $env:CONFIGURATION
-    if ($LastExitCode -ne 0) {
-        throw "Exec: $ErrorMessage"
-    }
-    cd ..\TestBuild
-    & cmake -G "$generator" -DCMAKE_PREFIX_PATH:PATH=..\build ..\Testing
+    cmake -G "$generator" -DOpenIGTLink_PROTOCOL_VERSION_3=OFF ..
     if ($LastExitCode -ne 0) {
         throw "Exec: $ErrorMessage"
     }