Skip to content

Commit 8132535

Browse files
author
Jaume Coll-Font
authored
Merge branch 'master' into master
2 parents 06fde43 + 16f2803 commit 8132535

File tree

344 files changed

+25584
-10491
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

344 files changed

+25584
-10491
lines changed

‎Superbuild/GLMExternal.cmake‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# For more information, please see: http://software.sci.utah.edu
2+
#
3+
# The MIT License
4+
#
5+
# Copyright (c) 2015 Scientific Computing and Imaging Institute,
6+
# University of Utah.
7+
#
8+
#
9+
# Permission is hereby granted, free of charge, to any person obtaining a
10+
# copy of this software and associated documentation files (the "Software"),
11+
# to deal in the Software without restriction, including without limitation
12+
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
13+
# and/or sell copies of the Software, and to permit persons to whom the
14+
# Software is furnished to do so, subject to the following conditions:
15+
#
16+
# The above copyright notice and this permission notice shall be included
17+
# in all copies or substantial portions of the Software.
18+
#
19+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
20+
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
22+
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
24+
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
25+
# DEALINGS IN THE SOFTWARE.
26+
27+
SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
28+
29+
# If CMake ever allows overriding the checkout command or adding flags,
30+
# git checkout -q will silence message about detached head (harmless).
31+
ExternalProject_Add(GLM_external
32+
GIT_REPOSITORY "https://github.com/g-truc/glm.git"
33+
GIT_TAG "0.9.4.6"
34+
CONFIGURE_COMMAND ""
35+
BUILD_COMMAND ""
36+
INSTALL_COMMAND ""
37+
CMAKE_CACHE_ARGS
38+
-DCMAKE_VERBOSE_MAKEFILE:BOOL=${CMAKE_VERBOSE_MAKEFILE}
39+
-DGLM_SWIZZLE:BOOL=ON
40+
-DGLM_FORCE_CXX03:BOOL=ON
41+
-DGLM_FORCE_RADIANS:BOOL=ON
42+
)
43+
44+
ExternalProject_Get_Property(GLM_external SOURCE_DIR)
45+
SET(GLM_DIR ${SOURCE_DIR})
46+
47+
MESSAGE(STATUS "GLM_DIR: ${GLM_DIR}")

‎Superbuild/GlewExternal.cmake‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# For more information, please see: http://software.sci.utah.edu
2+
#
3+
# The MIT License
4+
#
5+
# Copyright (c) 2016 Scientific Computing and Imaging Institute,
6+
# University of Utah.
7+
#
8+
#
9+
# Permission is hereby granted, free of charge, to any person obtaining a
10+
# copy of this software and associated documentation files (the "Software"),
11+
# to deal in the Software without restriction, including without limitation
12+
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
13+
# and/or sell copies of the Software, and to permit persons to whom the
14+
# Software is furnished to do so, subject to the following conditions:
15+
#
16+
# The above copyright notice and this permission notice shall be included
17+
# in all copies or substantial portions of the Software.
18+
#
19+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
20+
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
22+
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
24+
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
25+
# DEALINGS IN THE SOFTWARE.
26+
27+
SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
28+
SET(glew_GIT_TAG "origin/master")
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+
# If CMake ever allows overriding the checkout command or adding flags,
36+
# git checkout -q will silence message about detached head (harmless).
37+
ExternalProject_Add(Glew_external
38+
GIT_REPOSITORY "https://github.com/CIBC-Internal/glew.git"
39+
GIT_TAG ${glew_GIT_TAG}
40+
PATCH_COMMAND ""
41+
INSTALL_DIR ""
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+
-DCMAKE_CXX_FLAGS:STATIC=${CMAKE_CXX_FLAGS}
48+
-DCMAKE_C_FLAGS:STATIC=${CMAKE_C_FLAGS}
49+
)
50+
51+
ExternalProject_Get_Property(Glew_external BINARY_DIR)
52+
SET(Glew_DIR ${BINARY_DIR} CACHE PATH "")
53+
54+
MESSAGE(STATUS "Glew_DIR: ${Glew_DIR}")

‎Superbuild/LodePngExternal.cmake‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# For more information, please see: http://software.sci.utah.edu
2+
#
3+
# The MIT License
4+
#
5+
# Copyright (c) 2015 Scientific Computing and Imaging Institute,
6+
# University of Utah.
7+
#
8+
#
9+
# Permission is hereby granted, free of charge, to any person obtaining a
10+
# copy of this software and associated documentation files (the "Software"),
11+
# to deal in the Software without restriction, including without limitation
12+
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
13+
# and/or sell copies of the Software, and to permit persons to whom the
14+
# Software is furnished to do so, subject to the following conditions:
15+
#
16+
# The above copyright notice and this permission notice shall be included
17+
# in all copies or substantial portions of the Software.
18+
#
19+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
20+
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
22+
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
24+
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
25+
# DEALINGS IN THE SOFTWARE.
26+
27+
SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
28+
29+
# If CMake ever allows overriding the checkout command or adding flags,
30+
# git checkout -q will silence message about detached head (harmless).
31+
ExternalProject_Add(LodePng_external
32+
GIT_REPOSITORY "https://github.com/CIBC-Internal/cibc-lodepng.git"
33+
GIT_TAG "origin/master"
34+
INSTALL_COMMAND ""
35+
CMAKE_CACHE_ARGS
36+
-DCMAKE_VERBOSE_MAKEFILE:BOOL=${CMAKE_VERBOSE_MAKEFILE}
37+
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
38+
)
39+
40+
ExternalProject_Get_Property(LodePng_external BINARY_DIR)
41+
SET(LODEPNG_DIR ${BINARY_DIR})
42+
43+
MESSAGE(STATUS "LODEPNG_DIR: ${LODEPNG_DIR}")

‎Superbuild/Superbuild.cmake‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,13 @@ ADD_EXTERNAL( ${SUPERBUILD_DIR}/SQLiteExternal.cmake SQLite_external )
169169
ADD_EXTERNAL( ${SUPERBUILD_DIR}/LibPNGExternal.cmake LibPNG_external )
170170
ADD_EXTERNAL( ${SUPERBUILD_DIR}/TeemExternal.cmake Teem_external )
171171
ADD_EXTERNAL( ${SUPERBUILD_DIR}/FreetypeExternal.cmake Freetype_external )
172+
ADD_EXTERNAL( ${SUPERBUILD_DIR}/GLMExternal.cmake GLM_external )
173+
ADD_EXTERNAL( ${SUPERBUILD_DIR}/TnyExternal.cmake Tny_external )
174+
ADD_EXTERNAL( ${SUPERBUILD_DIR}/LodePngExternal.cmake LodePng_external )
175+
176+
IF(WIN32)
177+
ADD_EXTERNAL( ${SUPERBUILD_DIR}/GlewExternal.cmake Glew_external )
178+
ENDIF()
172179

173180
IF(BUILD_WITH_PYTHON)
174181
ADD_EXTERNAL( ${SUPERBUILD_DIR}/PythonExternal.cmake Python_external )
@@ -219,6 +226,10 @@ SET(SCIRUN_CACHE_ARGS
219226
"-DTeem_DIR:PATH=${Teem_DIR}"
220227
"-DTetgen_DIR:PATH=${Tetgen_DIR}"
221228
"-DFreetype_DIR:PATH=${Freetype_DIR}"
229+
"-DGLM_DIR:PATH=${GLM_DIR}"
230+
"-DTNY_DIR:PATH=${TNY_DIR}"
231+
"-DGLEW_DIR:PATH=${Glew_DIR}"
232+
"-DLODEPNG_DIR:PATH=${LODEPNG_DIR}"
222233
"-DSCI_DATA_DIR:PATH=${SCI_DATA_DIR}"
223234
)
224235

‎Superbuild/TnyExternal.cmake‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# For more information, please see: http://software.sci.utah.edu
2+
#
3+
# The MIT License
4+
#
5+
# Copyright (c) 2015 Scientific Computing and Imaging Institute,
6+
# University of Utah.
7+
#
8+
#
9+
# Permission is hereby granted, free of charge, to any person obtaining a
10+
# copy of this software and associated documentation files (the "Software"),
11+
# to deal in the Software without restriction, including without limitation
12+
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
13+
# and/or sell copies of the Software, and to permit persons to whom the
14+
# Software is furnished to do so, subject to the following conditions:
15+
#
16+
# The above copyright notice and this permission notice shall be included
17+
# in all copies or substantial portions of the Software.
18+
#
19+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
20+
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
22+
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
24+
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
25+
# DEALINGS IN THE SOFTWARE.
26+
27+
SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
28+
29+
# If CMake ever allows overriding the checkout command or adding flags,
30+
# git checkout -q will silence message about detached head (harmless).
31+
ExternalProject_Add(Tny_external
32+
GIT_REPOSITORY "https://github.com/CIBC-Internal/Tny.git"
33+
GIT_TAG "origin/master"
34+
#CONFIGURE_COMMAND ""
35+
#BUILD_COMMAND ""
36+
INSTALL_COMMAND ""
37+
CMAKE_CACHE_ARGS
38+
-DCMAKE_VERBOSE_MAKEFILE:BOOL=${CMAKE_VERBOSE_MAKEFILE}
39+
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
40+
)
41+
42+
ExternalProject_Get_Property(Tny_external BINARY_DIR)
43+
SET(TNY_DIR ${BINARY_DIR})
44+
45+
MESSAGE(STATUS "TNY_DIR: ${TNY_DIR}")

‎src/CMake/Modules/CPack.Description.plist.in‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/CMake/Modules/CPack.Distribution.dist.in‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8" standalone="no"?>
2+
<installer-gui-script minSpecVersion="1">
3+
<title>@CPACK_PACKAGE_NAME@</title>
4+
<allowed-os-versions>
5+
<os-version min="@OSX_MINIMUM_OS_VERSION@"/>
6+
</allowed-os-versions>
7+
<license file="@CPACK_RESOURCE_FILE_LICENSE@" mime-type="text/plain"/>
8+
<welcome file="@CPACK_RESOURCE_FILE_WELCOME@" mime-type="text/plain"/>
9+
<pkg-ref id="edu.utah.sci.@CPACK_PACKAGE_NAME@"/>
10+
<options customize="never" require-scripts="false"/>
11+
<choices-outline>
12+
<line choice="default">
13+
<line choice="edu.utah.sci.@CPACK_PACKAGE_NAME@"/>
14+
</line>
15+
</choices-outline>
16+
<choice id="default"/>
17+
<choice id="edu.utah.sci.@CPACK_PACKAGE_NAME@" visible="false">
18+
<pkg-ref id="edu.utah.sci.@CPACK_PACKAGE_NAME@"/>
19+
</choice>
20+
<pkg-ref id="edu.utah.sci.@CPACK_PACKAGE_NAME@" version="0" onConclusion="none">@[email protected]</pkg-ref>
21+
</installer-gui-script>

‎src/CMake/scripts/repair_package.sh.in‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/usr/bin/env bash
2+
3+
scirunbuild_dir=@CMAKE_BINARY_DIR@
4+
productbuild_dir=@PKG_BUILD_DIR@
5+
productroot_dir=@PKG_ROOT_DIR@
6+
7+
if [[ ! -e $productroot_dir ]]; then
8+
echo "$productroot_dir does not exist"
9+
exit 1
10+
fi
11+
12+
@PKGBUILD_EXE@ --analyze --root $productroot_dir $scirunbuild_dir/@[email protected]
13+
@PKGBUILD_EXE@ --identifier edu.utah.sci.@CPACK_PACKAGE_NAME@ --root $productroot_dir \
14+
--component-plist $scirunbuild_dir/@[email protected] \
15+
--install-location /Applications $scirunbuild_dir/@[email protected]
16+
@PRODUCTBUILD_EXE@ --distribution $scirunbuild_dir/CPack.Distribution.dist \
17+
--package-path $productroot_dir $productbuild_dir/tmp.pkg
18+
# Tip: pkgutil --expand can be used to debug package building
19+
@PKGUTIL_EXE@ --expand $productbuild_dir/tmp.pkg $productbuild_dir/tmp
20+
@PKGUTIL_EXE@ --flatten $productbuild_dir/tmp $scirunbuild_dir/@[email protected]
21+
rm -f $scirunbuild_dir/@[email protected] $scirunbuild_dir/@[email protected]
22+
rm -Rf $productbuild_dir/tmp

0 commit comments

Comments
 (0)