File tree Expand file tree Collapse file tree 11 files changed +4
-69
lines changed Expand file tree Collapse file tree 11 files changed +4
-69
lines changed Original file line number Diff line number Diff line change @@ -10,7 +10,10 @@ before_install:
10
10
- 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
11
11
script :
12
12
- cd bin
13
- - cmake -GNinja -DTRAVIS_BUILD:BOOL=ON -DQT_MIN_VERSION:STRING=5.9 -DQt5_PATH=$(dpkg -L qtbase5-dev) ../Superbuild
13
+ - |
14
+ export CFLAGS="-w"
15
+ export CXXFLAGS="-w"
16
+ cmake -GNinja -DQT_MIN_VERSION:STRING=5.9 -DQt5_PATH=$(dpkg -L qtbase5-dev) ../Superbuild
14
17
- travis_wait 70 ninja
15
18
16
19
after_success :
Original file line number Diff line number Diff line change @@ -71,10 +71,6 @@ endif()
71
71
72
72
set (boost_GIT_URL "https://github.com/CIBC-Internal/boost.git" )
73
73
74
- if (TRAVIS_BUILD)
75
- list (APPEND boost_CXX_Flag "-w" )
76
- endif ()
77
-
78
74
# TODO: fix install step
79
75
#
80
76
# If CMake ever allows overriding the checkout command or adding flags,
Original file line number Diff line number Diff line change 27
27
set_property (DIRECTORY PROPERTY "EP_BASE" ${ep_base} )
28
28
set (freetype_GIT_TAG "origin/master" )
29
29
30
- if (TRAVIS_BUILD)
31
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w" )
32
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w" )
33
- endif ()
34
-
35
30
# If CMake ever allows overriding the checkout command or adding flags,
36
31
# git checkout -q will silence message about detached head (harmless).
37
32
ExternalProject_Add(Freetype_external
Original file line number Diff line number Diff line change 27
27
set_property (DIRECTORY PROPERTY "EP_BASE" ${ep_base} )
28
28
set (glew_GIT_TAG "origin/master" )
29
29
30
- if (TRAVIS_BUILD)
31
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w" )
32
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w" )
33
- endif ()
34
-
35
30
# If CMake ever allows overriding the checkout command or adding flags,
36
31
# git checkout -q will silence message about detached head (harmless).
37
32
ExternalProject_Add(Glew_external
Original file line number Diff line number Diff line change @@ -35,16 +35,6 @@ set(itk_ARGS
35
35
"-DITK_INSTALL_NO_DEVELOPMENT:BOOL=OFF"
36
36
)
37
37
38
- if (TRAVIS_BUILD)
39
- list (APPEND itk_ARGS
40
- "-Wno-dev"
41
- "-Wno-deprecated"
42
- )
43
-
44
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w" )
45
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w" )
46
- endif ()
47
-
48
38
set (itk_CACHE_ARGS
49
39
"-DCMAKE_VERBOSE_MAKEFILE:BOOL=${CMAKE_VERBOSE_MAKEFILE} "
50
40
"-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} "
Original file line number Diff line number Diff line change @@ -28,10 +28,6 @@ set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
28
28
set (implicitFunction_GIT_TAG "origin/master" )
29
29
set (implicitFunction_DEPENDENCIES "Tetgen_external;Eigen_external" )
30
30
31
- if (TRAVIS_BUILD)
32
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w" )
33
- endif ()
34
-
35
31
# If CMake ever allows overriding the checkout command or adding flags,
36
32
# git checkout -q will silence message about detached head (harmless).
37
33
ExternalProject_Add(ImplicitFunction_external
Original file line number Diff line number Diff line change @@ -28,11 +28,6 @@ set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
28
28
set (libpng_GIT_TAG "origin/master" )
29
29
set (libpng_DEPENDENCIES "Zlib_external" )
30
30
31
- if (TRAVIS_BUILD)
32
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w" )
33
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w" )
34
- endif ()
35
-
36
31
# If CMake ever allows overriding the checkout command or adding flags,
37
32
# git checkout -q will silence message about detached head (harmless).
38
33
ExternalProject_Add(LibPNG_external
Original file line number Diff line number Diff line change 27
27
set_property (DIRECTORY PROPERTY "EP_BASE" ${ep_base} )
28
28
set (sqlite_GIT_TAG "origin/master" )
29
29
30
- if (TRAVIS_BUILD)
31
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w" )
32
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w" )
33
- endif ()
34
-
35
30
# If CMake ever allows overriding the checkout command or adding flags,
36
31
# git checkout -q will silence message about detached head (harmless).
37
32
ExternalProject_Add(SQLite_external
Original file line number Diff line number Diff line change @@ -28,11 +28,6 @@ set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
28
28
set (teem_GIT_TAG "origin/master" )
29
29
set (teem_DEPENDENCIES "Zlib_external;LibPNG_external" )
30
30
31
- if (TRAVIS_BUILD)
32
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w" )
33
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w" )
34
- endif ()
35
-
36
31
# If CMake ever allows overriding the checkout command or adding flags,
37
32
# git checkout -q will silence message about detached head (harmless).
38
33
ExternalProject_Add(Teem_external
Original file line number Diff line number Diff line change @@ -28,26 +28,6 @@ set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
28
28
29
29
set (TETGEN_LIBRARY "tet" )
30
30
31
- # if(TRAVIS_BUILD OR ${CMAKE_VERSION} VERSION_GREATER 3.7.2)
32
- # # allowed since CMake 3.7.2
33
- # # only supporting in CI builds for now, since CMake version is so new
34
- # set(DOWNLOAD_URL "http://tetgen.org/files/tetgen1.4.3.tar.gz http://www.sci.utah.edu/devbuilds/seg3d/tetgen1.4.3.tar.gz")
35
- # else()
36
- # set(DOWNLOAD_URL "http://tetgen.org/files/tetgen1.4.3.tar.gz")
37
- # endif()
38
-
39
- # ExternalProject_Add(Tetgen_external
40
- # URL ${DOWNLOAD_URL}
41
- # PATCH_COMMAND ""
42
- # INSTALL_COMMAND ""
43
- # CMAKE_CACHE_ARGS
44
- # -DCMAKE_VERBOSE_MAKEFILE:BOOL=${CMAKE_VERBOSE_MAKEFILE}
45
- # -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
46
- # -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
47
- # -DTETGEN_LIBRARY:STRING=${TETGEN_LIBRARY}
48
- # )
49
-
50
-
51
31
set (tetgen_SVN_URL "https://gforge.sci.utah.edu/svn/tetgen" )
52
32
#set(sci_data_DIR "${CMAKE_BINARY_DIR}/SCIRunData")
53
33
You can’t perform that action at this time.
0 commit comments