Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
5288c27
fixing cmake and externals
basisunus Jan 14, 2026
d808f56
boost builds on windows with vs 2022
basisunus Jan 15, 2026
b9358db
fixing qt errors
basisunus Jan 15, 2026
8ef9b25
fixing boost include dir
basisunus Jan 21, 2026
e9dcbbd
cleaned boost issues
basisunus Jan 22, 2026
c3e0c04
fixing python new version
basisunus Jan 22, 2026
4d7ffbc
udpated cmakes for externals
basisunus Jan 26, 2026
18d684c
issues with externals
basisunus Jan 26, 2026
e948db0
updated tetgen to install
basisunus Jan 27, 2026
64ec713
removed errors from cleaver2
basisunus Jan 27, 2026
f5ef94d
updating external cmakes
basisunus Jan 27, 2026
336571d
external cmakes
basisunus Jan 29, 2026
056c4d1
fixing freetype
basisunus Jan 29, 2026
7b788d5
making cmake changes
basisunus Jan 29, 2026
92bb6cb
Merge branch 'master' into refactor
basisunus Jan 29, 2026
5efaeb8
fixing dependency on zlib for external libs
basisunus Jan 30, 2026
1d869a5
fixing zlib interdependency
basisunus Jan 30, 2026
0ecda93
updated teem
basisunus Jan 30, 2026
cb8a5f2
fixed teem
basisunus Feb 2, 2026
01b54f0
scirun cmake errors
basisunus Feb 3, 2026
3ff41f9
making sure paths generated in superbuild are correct. need to check …
basisunus Feb 3, 2026
103f83b
finding boost in scirun src
basisunus Feb 4, 2026
6d0402a
installing boost headers
basisunus Feb 4, 2026
bac6179
fixed glm headers but there are more for boost, glew, tny, lodepng
basisunus Feb 5, 2026
e432dd0
cmake
basisunus Feb 6, 2026
1168d71
cmake
basisunus Feb 6, 2026
a013417
headers
basisunus Feb 6, 2026
ab20c05
header copy
basisunus Feb 6, 2026
41d0e34
tny header path
basisunus Feb 6, 2026
65ec892
default qt path on my computer
basisunus Feb 6, 2026
13ae258
boost lib version names
basisunus Feb 6, 2026
227012c
sqlite issue
basisunus Feb 9, 2026
358c89d
sqlite
basisunus Feb 9, 2026
8ac87b7
python
basisunus Feb 10, 2026
f395200
python issues
basisunus Feb 10, 2026
6d914fa
link error
basisunus Feb 11, 2026
3925747
more errors
basisunus Feb 11, 2026
74506a8
freetype
basisunus Feb 11, 2026
9fb63dd
more errors
basisunus Feb 11, 2026
9a2449d
cmake
basisunus Feb 11, 2026
50e6318
teem linking error
basisunus Feb 13, 2026
c1a0d96
linking errors of modules
basisunus Feb 14, 2026
362c781
cleaver path
basisunus Feb 17, 2026
876f951
boost python
basisunus Feb 17, 2026
17875f1
Merge branch 'master' into refactor
basisunus Feb 17, 2026
7ca6d58
removed some linking errors
basisunus Feb 17, 2026
e24d46a
adding libs to link
basisunus Feb 18, 2026
c07019a
teem link
basisunus Feb 18, 2026
b7b1972
fixing python linking errors
basisunus Feb 20, 2026
a8ae911
python issues in boost and scirun python api
basisunus Feb 21, 2026
af32588
linking errors, python lib, zlib used by teem
basisunus Feb 23, 2026
3dffada
remove system python from superbuild and stick with external python
basisunus Feb 23, 2026
e4e52d4
python path and external lib paths
basisunus Feb 24, 2026
0df70da
tetgen inlcude path
basisunus Feb 24, 2026
b976d40
tetgen not found issue
basisunus Feb 27, 2026
2b2312a
python and qwt
basisunus Mar 2, 2026
593be22
ctk deprecated functions
basisunus Mar 3, 2026
ab2cc98
qwt wrapper
basisunus Mar 3, 2026
83a75c2
qwt build
basisunus Mar 3, 2026
f64bd7e
Pin googletest submodule to v1.14.0 (replace missing ref 8565cc5...)
basisunus Mar 5, 2026
2aa633a
boost exception
basisunus Mar 5, 2026
359021a
vc143.pdb conflicts
basisunus Mar 5, 2026
2bef99c
vc debug-release mismatch
basisunus Mar 5, 2026
97ba8fc
release vs debug crt settings
basisunus Mar 6, 2026
957ec59
qwt lib linking
basisunus Mar 6, 2026
d35e377
updated tetgen call to 1.6 signature
basisunus Mar 9, 2026
1ca8c0a
glew and tny missing
basisunus Mar 9, 2026
6675770
glew not found
basisunus Mar 9, 2026
e8ad94f
python update error
basisunus Mar 9, 2026
2efffc7
freetype lib not found
basisunus Mar 10, 2026
e559ab0
added Core_Algorithm_Legacy_Fields to where it's needed
basisunus Mar 10, 2026
f6c24fc
typos in lib name
basisunus Mar 10, 2026
c4f05eb
more missing libs in link
basisunus Mar 11, 2026
30130a1
lodepng not found for linking
basisunus Mar 11, 2026
a302be3
qt flag not passed to modules
basisunus Mar 12, 2026
8e8f84d
python lib in main
basisunus Mar 12, 2026
b373624
startup crash
basisunus Mar 12, 2026
cc83885
Merge branch 'master' into refactor
basisunus Mar 16, 2026
4b589cf
lodepng on mac
basisunus Mar 17, 2026
a4741ce
added default qt path for easy testing on current macbook
basisunus Mar 17, 2026
b69f06a
boost on mac
basisunus Mar 17, 2026
d483a85
boost update
basisunus Mar 17, 2026
cfc1ba2
freetype include path on macos
basisunus Mar 18, 2026
d248c56
freetype path was still incorrect on macos
basisunus Mar 18, 2026
ca24387
lodepng path incorrect on macos similar to freetype
basisunus Mar 18, 2026
8c9258d
lodepng lib not set correctly for mac
basisunus Mar 18, 2026
3b7de4b
python verification incorrect for mac
basisunus Mar 18, 2026
5e5df62
python lib path still incorrect
basisunus Mar 18, 2026
3f5dd25
bin dir for python not found
basisunus Mar 18, 2026
837022b
tetgen lib not found
basisunus Mar 18, 2026
4668d22
lodepng and glew not defined for mac
basisunus Mar 18, 2026
497086b
glew not built on mac
basisunus Mar 20, 2026
4d399f8
glew copy failed on mac
basisunus Mar 20, 2026
a52aff2
glew dependency order
basisunus Mar 20, 2026
a2a867e
glew win and mac settings difference
basisunus Mar 20, 2026
e2f9f61
case mismatch of glew file name on mac
basisunus Mar 20, 2026
8b76fff
still not right case
basisunus Mar 20, 2026
5a7e702
glew install cross platform
basisunus Mar 20, 2026
fe61d7a
find_package for glew in scirun cmake
basisunus Mar 20, 2026
accab9d
lode png not configed correctly for mac
basisunus Mar 20, 2026
6c30d81
boost include dir
basisunus Mar 20, 2026
5cb4b4c
updated to match refactor-to-master
basisunus Apr 21, 2026
1b432c9
Update BoostExternal.cmake
basisunus Apr 21, 2026
0f9b0b3
removed without python flag for b2
basisunus Apr 22, 2026
31d81ff
diagnosis for testing is on
basisunus Apr 23, 2026
2361cbf
added boost to container test via container
basisunus Apr 23, 2026
3008416
added boost to core_math for graphics datatypes test
basisunus Apr 23, 2026
810286b
made core_exception_legacy public in core_math
basisunus Apr 23, 2026
b14d0c6
upated github action workflows to use vs2022 mostly
basisunus Apr 24, 2026
9abec00
Merge remote-tracking branch 'remotes/origin/master' into refactor
basisunus Apr 27, 2026
dd03018
updated ospray
basisunus Apr 27, 2026
fbe37e0
updated opsray cmake
basisunus Apr 27, 2026
6db5ddf
python version on linux
basisunus Apr 27, 2026
e572b94
ospray doc is private
basisunus Apr 28, 2026
a991707
Merge branch 'refactor' of https://github.com/SCIInstitute/SCIRun int…
basisunus Apr 28, 2026
e434b86
added rkcommon, which is needed by ospray
basisunus Apr 28, 2026
5db2254
file name typo
basisunus Apr 28, 2026
3737b55
more typo
basisunus Apr 28, 2026
972bba2
fixing ospray build
basisunus Apr 28, 2026
b137319
embree not working with ospray
basisunus Apr 29, 2026
2f9b61b
ospary patch
basisunus Apr 29, 2026
b68d9fb
ospray not building
basisunus Apr 29, 2026
b0c40e8
windows github workflows updates
basisunus Apr 29, 2026
c962db9
windows workflow
basisunus Apr 29, 2026
249b818
fixed python path on linux
basisunus Apr 29, 2026
5f5f024
linux linking flag for boost python
basisunus Apr 30, 2026
88e0874
Merge remote-tracking branch 'remotes/origin/master' into refactor
basisunus Apr 30, 2026
bc05e21
Merge branch 'refactor' of https://github.com/SCIInstitute/SCIRun int…
basisunus Apr 30, 2026
c91b183
windows test failure on core_containers because it doesn't export sym…
basisunus Apr 30, 2026
b506234
typo
basisunus Apr 30, 2026
c0c8b9e
cmake
basisunus Apr 30, 2026
ffc3c79
disabled tests for core logging similar to applications because of th…
basisunus May 1, 2026
f4fbadd
removed qwt from cpack install because it's built static
basisunus May 1, 2026
f84b512
division by zero at drawing progress bar
basisunus May 4, 2026
929c657
scale bar crash
basisunus May 4, 2026
a844a8e
updated based on dan's comments
basisunus May 5, 2026
e87d416
python
basisunus May 6, 2026
b4a3da3
switched python functions for gil state because of multi threaded exe…
basisunus May 8, 2026
5ca858c
removed comments
basisunus May 8, 2026
069cc0b
python
basisunus May 6, 2026
2b3a4c5
switched python functions for gil state because of multi threaded exe…
basisunus May 8, 2026
5acf6c2
removed comments
basisunus May 8, 2026
ed7a3d9
added PyEval_SaveThread to python initialization to fix thread state
basisunus May 8, 2026
8b6459c
added PyEval_SaveThread to python initialization to fix thread state
basisunus May 8, 2026
5285567
guard boost python objects
basisunus May 11, 2026
4546130
guard boost::python::object
basisunus May 11, 2026
c3334f7
reverted py_finalize
basisunus May 11, 2026
10999e4
Merge branch 'refactor_update' into refactor
basisunus May 11, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ cmake

# Sphinx builds
docs/_build/
/build
187 changes: 181 additions & 6 deletions Superbuild/BoostConfig.cmake.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,181 @@
set(SCI_BOOST_INCLUDE "@SCI_BOOST_INCLUDE@")

# These are IMPORTED targets created by FooBarTargets.cmake
set(SCI_BOOST_LIBRARY @SCI_BOOST_LIBRARY@)
set(SCI_BOOST_LIBRARY_DIR "@SCI_BOOST_LIBRARY_DIR@")
set(SCI_BOOST_USE_FILE "@SCI_BOOST_USE_FILE@")
# ============================================================================
# BoostConfig.cmake - template for SCIRun superbuild to generate a CMake config file for Boost
# ============================================================================

@PACKAGE_INIT@

set(Boost_FOUND TRUE)

# ---------------------------------------------------------------------------
# Paths
# ---------------------------------------------------------------------------
set(Boost_INCLUDE_DIRS "@SCI_BOOST_INCLUDE@")
set(Boost_LIBRARY_DIR "@SCI_BOOST_LIBRARY_DIR@")

# ---------------------------------------------------------------------------
# Helper: define Boost imported library target (cross-platform)
# ---------------------------------------------------------------------------
function(_scirun_define_boost_target lib)
# If Boost already created the target, just ensure includes
if(TARGET Boost::${lib})
set_target_properties(Boost::${lib} PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}"
)
return()
endif()

# Boost.Atomic is header-only on macOS
if(APPLE AND lib STREQUAL "atomic")
add_library(Boost::atomic INTERFACE IMPORTED)
set_target_properties(Boost::atomic PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}"
)
return()
endif()

# Create imported library target
add_library(Boost::${lib} UNKNOWN IMPORTED)
set_target_properties(Boost::${lib} PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}"
)

# Boost.Python static macro (SCIRun convention)
if(lib MATCHES "^python")
set_target_properties(Boost::${lib} PROPERTIES
INTERFACE_COMPILE_DEFINITIONS BOOST_PYTHON_STATIC_LIB
)
endif()

# Detect architecture
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(_boost_arch "x64")
else()
set(_boost_arch "x32")
endif()

set(_release_lib "")
set(_debug_lib "")

# -------------------------------------------------------------------------
# Windows: SCIRun-built Boost uses tagged .lib names
# -------------------------------------------------------------------------
if(WIN32)
file(GLOB _all_candidates
"${Boost_LIBRARY_DIR}/libboost_${lib}-*.lib"
)

list(FILTER _all_candidates INCLUDE REGEX "-${_boost_arch}-")

if(NOT _all_candidates)
message(FATAL_ERROR
"Boost '${lib}' not found for architecture ${_boost_arch}\n"
"Directory: ${Boost_LIBRARY_DIR}"
)
endif()

# -----------------------------------------------------------------------
# ABI-aware Debug / Release selection (Boost 1.8+)
#
# Rules:
# - Debug libraries contain '-g'
# - Release libraries do NOT contain '-g'
# - 'y' means Python enabled and may appear in BOTH
# -----------------------------------------------------------------------

# Debug candidates
set(_dbg_candidates "${_all_candidates}")
list(FILTER _dbg_candidates INCLUDE REGEX "-g")

if(_dbg_candidates)
list(GET _dbg_candidates 0 _debug_lib)
endif()

# Release candidates
set(_rel_candidates "${_all_candidates}")
list(FILTER _rel_candidates EXCLUDE REGEX "-g")

if(_rel_candidates)
list(GET _rel_candidates 0 _release_lib)
endif()

# -------------------------------------------------------------------------
# macOS / Linux
# -------------------------------------------------------------------------
else()
file(GLOB _all_candidates
"${Boost_LIBRARY_DIR}/libboost_${lib}.a"
"${Boost_LIBRARY_DIR}/libboost_${lib}-mt.a"
"${Boost_LIBRARY_DIR}/libboost_${lib}.dylib"
"${Boost_LIBRARY_DIR}/libboost_${lib}-mt.dylib"
)

if(NOT _all_candidates)
message(FATAL_ERROR
"Boost library '${lib}' could not be resolved.\n"
"Directory: ${Boost_LIBRARY_DIR}\n"
"Platform: ${CMAKE_SYSTEM_NAME}"
)
endif()

list(GET _all_candidates 0 _release_lib)
set(_debug_lib "${_release_lib}")
endif()

# -------------------------------------------------------------------------
# Fail fast if resolution failed
# -------------------------------------------------------------------------
if(NOT _release_lib OR NOT _debug_lib)
message(FATAL_ERROR
"Boost library '${lib}' could not be resolved for both configurations.\n"
"All candidates:\n ${_all_candidates}"
)
endif()

set_target_properties(Boost::${lib} PROPERTIES
IMPORTED_CONFIGURATIONS "Release;Debug"
IMPORTED_LOCATION_RELEASE "${_release_lib}"
IMPORTED_LOCATION_DEBUG "${_debug_lib}"
)
endfunction()

# ---------------------------------------------------------------------------
# Core Boost components
# ---------------------------------------------------------------------------
_scirun_define_boost_target(atomic)
_scirun_define_boost_target(chrono)
_scirun_define_boost_target(date_time)
_scirun_define_boost_target(filesystem)
_scirun_define_boost_target(program_options)
_scirun_define_boost_target(regex)
_scirun_define_boost_target(serialization)
_scirun_define_boost_target(thread)

# ---------------------------------------------------------------------------
# Boost.Python (optional)
# ---------------------------------------------------------------------------
if(@BUILD_WITH_PYTHON@)
_scirun_define_boost_target(python@SCI_PYTHON_VERSION_SHORT_WIN32@)
endif()

# ---------------------------------------------------------------------------
# Compatibility variables
# ---------------------------------------------------------------------------
set(Boost_LIBRARIES
Boost::atomic
Boost::chrono
Boost::date_time
Boost::filesystem
Boost::program_options
Boost::regex
Boost::serialization
Boost::thread
)

add_library(Boost::headers INTERFACE IMPORTED)
set_target_properties(Boost::headers PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}"
)

if(@BUILD_WITH_PYTHON@)
list(APPEND Boost_LIBRARIES Boost::python@SCI_PYTHON_VERSION_SHORT_WIN32@)
endif()
Loading
Loading