Skip to content

Commit 27e4c0c

Browse files
author
Haydelj
committed
Merge branch 'colorMapTransparency' of https://github.com/Haydelj/SCIRun into colorMapTransparency
2 parents d7ae9ba + 3ffefc8 commit 27e4c0c

File tree

7 files changed

+61
-47
lines changed

7 files changed

+61
-47
lines changed

‎.travis.yml‎

Lines changed: 45 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,76 @@
11
language: c++
2+
# cache: ccache
23

34
matrix:
45
include:
56
- os: linux
67
dist: trusty
7-
sudo: required
88
compiler: gcc
9-
env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF
9+
env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF QT5=ON
1010
- os: linux
11-
dist: trusty
12-
sudo: required
13-
compiler: clang
14-
env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF
11+
dist: xenial
12+
compiler: gcc
13+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=ON
1514
- os: linux
1615
dist: xenial
17-
sudo: required
1816
compiler: clang
19-
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF
17+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=ON
18+
- os: linux
19+
dist: xenial
20+
compiler: gcc
21+
env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF QT5=ON
22+
- os: linux
23+
dist: bionic
24+
compiler: gcc
25+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=ON
2026
- os: osx
21-
osx_image: xcode7.2
22-
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF
27+
osx_image: xcode7.3
28+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=OFF
2329
- os: osx
2430
osx_image: xcode8.3
25-
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF
31+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=OFF
2632
- os: osx
27-
osx_image: xcode9.3
28-
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF
33+
osx_image: xcode9.4
34+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=OFF
2935
- os: osx
3036
osx_image: xcode10.1
31-
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF
37+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=OFF
38+
- os: osx
39+
osx_image: xcode10.3
40+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=ON
41+
- os: osx
42+
osx_image: xcode11
43+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=ON
3244
- os: osx
3345
osx_image: xcode7.2
34-
env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF
46+
env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF QT5=OFF
3547
- os: osx
3648
osx_image: xcode10.1
37-
env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF
49+
env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF QT5=ON
50+
- os: osx
51+
osx_image: xcode11
52+
env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF QT5=ON
3853

3954
before_install:
4055
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then date -u; fi
4156
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then uname -a; fi
42-
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build libqt4-dev qt4-qmake libqt4-opengl-dev; fi
43-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait 30 scripts/getQt4Mac.sh; fi
57+
58+
install:
59+
- if [[ "$QT5" = "OFF" && "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build libqt4-dev qt4-qmake libqt4-opengl-dev; fi
60+
- if [[ "$QT5" = "ON" && "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build qt5-qmake qtbase5-dev libqt5opengl5-dev libqt5svg5-dev; fi
61+
- if [[ "$QT5" = "OFF" && "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait 30 scripts/getQt4Mac.sh; fi
62+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ninja; fi
63+
# TODO: figure out/test ccache
64+
# - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache; export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi
65+
# Verify qt 5.13, maybe not upgrade
66+
- if [[ "$QT5" = "ON" && "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt || true; fi
67+
- if [[ "$QT5" = "ON" && "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade qt || true; fi
4468

4569
script:
4670
- cd bin
47-
- cmake -GNinja -DTRAVIS_BUILD:BOOL=ON -DUSER_PYTHON_VERSION="${PYTHON_VERSION}" -DWITH_OSPRAY:BOOL=${OSPRAY_BUILD} ../Superbuild
48-
- travis_wait 80 ninja
71+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake -GNinja -DTRAVIS_BUILD:BOOL=ON -DUSER_PYTHON_VERSION="${PYTHON_VERSION}" -DWITH_OSPRAY:BOOL=${OSPRAY_BUILD} -DQT5_BUILD:BOOL=${QT5} -DQt5_PATH=$(brew --prefix qt) ../Superbuild; fi
72+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cmake -GNinja -DTRAVIS_BUILD:BOOL=ON -DUSER_PYTHON_VERSION="${PYTHON_VERSION}" -DWITH_OSPRAY:BOOL=${OSPRAY_BUILD} -DQT5_BUILD:BOOL=${QT5} -DQt5_PATH=$(dpkg -L qtbase5-dev) ../Superbuild; fi
73+
- travis_wait 80 ninja # max is 50 minutes on public repository
4974
- cd SCIRun
5075
- ./Algorithm_Layer_Test
5176
- ./Modules_Factory_Tests --gtest_filter=*HardCodedModuleFactoryTests*

‎Superbuild/Superbuild.cmake‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,16 +111,12 @@ OPTION(TRAVIS_BUILD "Slim build for Travis CI" OFF)
111111
MARK_AS_ADVANCED(TRAVIS_BUILD)
112112

113113
IF(TRAVIS_BUILD)
114+
SET(BUILD_TESTING OFF)
115+
SET(DOWNLOAD_TOOLKITS OFF)
116+
SET(BUILD_WITH_SCIRUN_DATA OFF)
114117
IF(APPLE)
115-
SET(BUILD_TESTING OFF)
116-
SET(DOWNLOAD_TOOLKITS OFF)
117-
SET(BUILD_WITH_SCIRUN_DATA OFF)
118+
# build everything; qt flag is in travis.yml
118119
ELSE()
119-
SET(QT5_BUILD OFF) # need to check this one
120-
SET(BUILD_TESTING OFF)
121-
SET(DOWNLOAD_TOOLKITS OFF)
122-
SET(BUILD_WITH_SCIRUN_DATA OFF)
123-
124120
IF(CMAKE_C_COMPILER_ID MATCHES "GNU")
125121
SET(BUILD_HEADLESS ON)
126122
SET(BUILD_WITH_PYTHON OFF)
@@ -151,7 +147,11 @@ IF(NOT BUILD_HEADLESS)
151147
MESSAGE(FATAL_ERROR "QT ${QT_MIN_VERSION} or later is required for building the SCIRun GUI")
152148
ENDIF()
153149
ELSE()
154-
SET(QT_MIN_VERSION "5.12")
150+
IF(TRAVIS_BUILD)
151+
SET(QT_MIN_VERSION "5.4")
152+
ELSE()
153+
SET(QT_MIN_VERSION "5.13")
154+
ENDIF()
155155

156156
SET(Qt5_PATH "" CACHE PATH "Path to directory where Qt 5 is installed. Directory should contain lib and bin subdirectories.")
157157

‎scripts/getQt4Mac.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
brew tap cartr/qt4 || true
44
brew tap cartr/qt4
55
brew tap-pin cartr/qt4
6-
brew install cartr/qt4/qt ninja
6+
brew install cartr/qt4/qt

‎src/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\-(beta.[A-Za-z0-9_]+)\\-?.*" "\\1" VERS
119119
#MESSAGE(STATUS "Git version patch name: " "${VERSION_PATCH}")
120120

121121
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMake/Modules/Version.cc.in
122-
${CMAKE_CURRENT_SOURCE_DIR}/Core/Application/Version.cc)
123-
set(version_file "${CMAKE_CURRENT_SOURCE_DIR}/Core/Application/Version.cc")
122+
${CMAKE_CURRENT_BINARY_DIR}/Core/Application/Version.cc)
123+
set(version_file "${CMAKE_CURRENT_BINARY_DIR}/Core/Application/Version.cc")
124124

125125

126126
########################################################################

‎src/Core/Application/.gitignore‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/Core/Application/Application.h‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,17 @@ namespace Core
5050
/// @class Application
5151
/// @brief Application is the thread that processes all the actions in the program.
5252

53-
class Application;
54-
class ApplicationPrivate;
53+
struct ApplicationPrivate;
5554
typedef boost::shared_ptr<ApplicationPrivate> ApplicationPrivateHandle;
5655

5756

58-
class SCISHARE Application : boost::noncopyable //: public EventHandler, public RecursiveLockable
57+
class SCISHARE Application : boost::noncopyable
5958
{
6059
CORE_SINGLETON( Application );
6160

6261
private:
6362
Application();
64-
virtual ~Application();
63+
~Application();
6564

6665
public:
6766
void readCommandLine(int argc, const char* argv[]);
@@ -113,8 +112,6 @@ class SCISHARE Application : boost::noncopyable //: public EventHandler, public
113112
// static int GetMajorVersion();
114113
// static int GetMinorVersion();
115114
// static int GetPatchVersion();
116-
// static bool Is64Bit();
117-
// static bool Is32Bit();
118115
// static std::string GetApplicationName();
119116
// static std::string GetReleaseName();
120117
// static std::string GetApplicationNameAndVersion();

‎src/include/sci_defs/version_testdefs.h.in‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Copyright (c) 2015 Scientific Computing and Imaging Institute,
77
University of Utah.
88
9-
9+
1010
Permission is hereby granted, free of charge, to any person obtaining a
1111
copy of this software and associated documentation files (the "Software"),
1212
to deal in the Software without restriction, including without limitation
@@ -35,12 +35,5 @@
3535
#define SCIRUN_PATCH @SCIRUN_VERSION_PATCH@
3636

3737
#define SCIRUN_VERSION "@SCIRUN_VERSION_STRING@"
38-
#define SCIRUN_RCFILE_SUBVERSION "0"
39-
40-
#define SCIRUN_TCL_PACKAGE_VERSION "@SCIRUN_TCL_VERSION@"
41-
42-
#define SCIRUN_SVN_REVISION "@SCIRUN_SVN_WC_REVISION@"
43-
#define SCIRUN_SVN_URL "@SCIRUN_SVN_WC_URL@"
4438

4539
#endif
46-

0 commit comments

Comments
 (0)