COMP: Simplify build-system removing TRAVIS_BUILD option

CFLAGS and CXXFLAGS env. variables are explicitly set in travis configuration Explicit passing of "-Wno-deprecated" to ITK project is removed because (1) it is done starting with ITK project 4.0 in InsightSoftwareConsortium/ITK@8a135bcb1 (ENH: Detect/use recommended compiler flags) from 2011-08-20 and (2) Seg3D is build against ITK 5.x. See 3b6512c (Update ITK version to 5.1.0)
SCIInstitute · Oct 27, 2022 · 3174523 · 3174523
1 parent 41a8ddb
commit 3174523
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 69 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,10 @@ before_install:
   - sudo apt-get -qq --yes install ninja-build mesa-common-dev libgl1-mesa-dev libglu1-mesa-dev mesa-utils-extra libglapi-mesa libglapi-mesa qt5-qmake qtbase5-dev libqt5opengl5-dev libqt5svg5-dev
 script:
   - cd bin
-  - cmake -GNinja -DTRAVIS_BUILD:BOOL=ON -DQT_MIN_VERSION:STRING=5.9 -DQt5_PATH=$(dpkg -L qtbase5-dev) ../Superbuild
+  - |
+    export CFLAGS="-w"
+    export CXXFLAGS="-w"
+    cmake -GNinja -DQT_MIN_VERSION:STRING=5.9 -DQt5_PATH=$(dpkg -L qtbase5-dev) ../Superbuild
   - travis_wait 70 ninja
 
 after_success:

diff --git a/Superbuild/BoostExternal.cmake b/Superbuild/BoostExternal.cmake
@@ -71,10 +71,6 @@ endif()
 
 set(boost_GIT_URL "https://github.com/CIBC-Internal/boost.git")
 
-if(TRAVIS_BUILD)
-  list(APPEND boost_CXX_Flag "-w")
-endif()
-
 # TODO: fix install step
 #
 # If CMake ever allows overriding the checkout command or adding flags,

diff --git a/Superbuild/FreetypeExternal.cmake b/Superbuild/FreetypeExternal.cmake
@@ -27,11 +27,6 @@
 set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
 set(freetype_GIT_TAG "origin/master")
 
-if(TRAVIS_BUILD)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
-endif()
-
 # If CMake ever allows overriding the checkout command or adding flags,
 # git checkout -q will silence message about detached head (harmless).
 ExternalProject_Add(Freetype_external

diff --git a/Superbuild/GlewExternal.cmake b/Superbuild/GlewExternal.cmake
@@ -27,11 +27,6 @@
 set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
 set(glew_GIT_TAG "origin/master")
 
-if(TRAVIS_BUILD)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
-endif()
-
 # If CMake ever allows overriding the checkout command or adding flags,
 # git checkout -q will silence message about detached head (harmless).
 ExternalProject_Add(Glew_external

diff --git a/Superbuild/ITKExternal.cmake b/Superbuild/ITKExternal.cmake
@@ -35,16 +35,6 @@ set(itk_ARGS
   "-DITK_INSTALL_NO_DEVELOPMENT:BOOL=OFF"
 )
 
-if(TRAVIS_BUILD)
-  list(APPEND itk_ARGS
-    "-Wno-dev"
-    "-Wno-deprecated"
-  )
-
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
-endif()
-
 set(itk_CACHE_ARGS
   "-DCMAKE_VERBOSE_MAKEFILE:BOOL=${CMAKE_VERBOSE_MAKEFILE}"
   "-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}"

diff --git a/Superbuild/ImplicitFunctionExternal.cmake b/Superbuild/ImplicitFunctionExternal.cmake
@@ -28,10 +28,6 @@ set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
 set(implicitFunction_GIT_TAG "origin/master")
 set(implicitFunction_DEPENDENCIES "Tetgen_external;Eigen_external")
 
-if(TRAVIS_BUILD)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
-endif()
-
 # If CMake ever allows overriding the checkout command or adding flags,
 # git checkout -q will silence message about detached head (harmless).
 ExternalProject_Add(ImplicitFunction_external

diff --git a/Superbuild/LibPNGExternal.cmake b/Superbuild/LibPNGExternal.cmake
@@ -28,11 +28,6 @@ set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
 set(libpng_GIT_TAG "origin/master")
 set(libpng_DEPENDENCIES "Zlib_external")
 
-if(TRAVIS_BUILD)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
-endif()
-
 # If CMake ever allows overriding the checkout command or adding flags,
 # git checkout -q will silence message about detached head (harmless).
 ExternalProject_Add(LibPNG_external

diff --git a/Superbuild/SQLiteExternal.cmake b/Superbuild/SQLiteExternal.cmake
@@ -27,11 +27,6 @@
 set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
 set(sqlite_GIT_TAG "origin/master")
 
-if(TRAVIS_BUILD)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
-endif()
-
 # If CMake ever allows overriding the checkout command or adding flags,
 # git checkout -q will silence message about detached head (harmless).
 ExternalProject_Add(SQLite_external

diff --git a/Superbuild/TeemExternal.cmake b/Superbuild/TeemExternal.cmake
@@ -28,11 +28,6 @@ set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
 set(teem_GIT_TAG "origin/master")
 set(teem_DEPENDENCIES "Zlib_external;LibPNG_external")
 
-if(TRAVIS_BUILD)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
-endif()
-
 # If CMake ever allows overriding the checkout command or adding flags,
 # git checkout -q will silence message about detached head (harmless).
 ExternalProject_Add(Teem_external

diff --git a/Superbuild/TetgenExternal.cmake b/Superbuild/TetgenExternal.cmake
@@ -28,26 +28,6 @@ set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
 
 set(TETGEN_LIBRARY "tet")
 
-# if(TRAVIS_BUILD OR ${CMAKE_VERSION} VERSION_GREATER 3.7.2)
-  # # allowed since CMake 3.7.2
-  # # only supporting in CI builds for now, since CMake version is so new
-  # set(DOWNLOAD_URL "http://tetgen.org/files/tetgen1.4.3.tar.gz http://www.sci.utah.edu/devbuilds/seg3d/tetgen1.4.3.tar.gz")
-# else()
-  # set(DOWNLOAD_URL "http://tetgen.org/files/tetgen1.4.3.tar.gz")
-# endif()
-
-# ExternalProject_Add(Tetgen_external
-  # URL ${DOWNLOAD_URL}
-  # PATCH_COMMAND ""
-  # INSTALL_COMMAND ""
-  # CMAKE_CACHE_ARGS
-    # -DCMAKE_VERBOSE_MAKEFILE:BOOL=${CMAKE_VERBOSE_MAKEFILE}
-    # -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-    # -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
-    # -DTETGEN_LIBRARY:STRING=${TETGEN_LIBRARY}
-# )
-
-
 set(tetgen_SVN_URL "https://gforge.sci.utah.edu/svn/tetgen")
 #set(sci_data_DIR "${CMAKE_BINARY_DIR}/SCIRunData")
 

diff --git a/Superbuild/ZlibExternal.cmake b/Superbuild/ZlibExternal.cmake
@@ -27,11 +27,6 @@
 set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
 set(zlib_GIT_TAG "origin/master")
 
-if(TRAVIS_BUILD)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
-endif()
-
 # If CMake ever allows overriding the checkout command or adding flags,
 # git checkout -q will silence message about detached head (harmless).
 ExternalProject_Add(Zlib_external