Conversation
trying to use tetgen as an example to figure out a working solution
added tags for repos in cibc-internal and use tags to download src
# Conflicts: # Superbuild/Cleaver2External.cmake # Superbuild/FreetypeExternal.cmake # Superbuild/GlewExternal.cmake # Superbuild/SQLiteExternal.cmake # Superbuild/ZlibExternal.cmake
…those in scirun cmake next
|
looks like the windows failures are from a misconfiguration of qwt path for packaging. since it's built as static, there is no need to add it to packaging. |
…e link errors of unexported symbols (singlton::instance_) in dlls
dcwhite
left a comment
There was a problem hiding this comment.
Overall it's OK, we'll need to enable testing before it gets merged to master though. I requested several easy clean-up-style changes. I'll try to run this through AI review as well. @basisunus @jessdtate
| @@ -0,0 +1,16 @@ | |||
| $BuildDir = "C:\Users\Yong\Documents\SCIRun\build" | |||
There was a problem hiding this comment.
Fix hard-coded path, or don't check this in
| # Safe SCIRun build directory cleanup | ||
| # ============================================================ | ||
|
|
||
| $ExpectedBuildDir = "C:\Users\Yong\Documents\SCIRun\build" |
| TARGET_LINK_LIBRARIES(Core_CommandLine | ||
| ${SCI_BOOST_LIBRARY} | ||
| Boost::filesystem | ||
| Boost::program_options |
There was a problem hiding this comment.
I like this because it shows exactly what we're using in Boost and where. Will make replacement easier down the road
|
|
||
| #include <gtest/gtest.h> | ||
|
|
||
| /// @todo: this won't link in debug mode due to Logging::Instance impl |
| // Remove intermediate python variables | ||
| PyRun_SimpleString( "del (interpreter, __internal_compiler, __term_io, __term_err)\n" ); | ||
| PRINT_PY_INIT_DEBUG(12); | ||
| PyRun_SimpleString("del (interpreter, __internal_compiler, __term_io, __term_err)\n"); |
There was a problem hiding this comment.
This whole file is a mess (it was already a mess), it will need heavy testing on all three platforms. I'll make a new issue
| # ------------------------------------------------------------ | ||
| IF(IS_DIRECTORY "${Qt_PATH}") | ||
| if (QT_VERSION_MAJOR STREQUAL "6") | ||
| FIND_PACKAGE(Qt${QT_VERSION_MAJOR} ${SCIRUN_QT_MIN_VERSION} |
There was a problem hiding this comment.
Yes, here is an example so you don't litter cmakes with IF 5 ELSE 6 stuff
|
|
||
| IF(WITH_OSPRAY) | ||
| ADD_EXTERNAL( ${SUPERBUILD_DIR}/OsprayExternal.cmake Ospray_external ) | ||
| INCLUDE(${SUPERBUILD_DIR}/TBBExternal.cmake) |
There was a problem hiding this comment.
Revert this section or just comment it out
| @@ -0,0 +1,47 @@ | |||
| # For more information, please see: http://software.sci.utah.edu | |||
| # DEALINGS IN THE SOFTWARE. | ||
|
|
||
| SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base}) | ||
| # ------------------------------------------------------- |
There was a problem hiding this comment.
This is an improvement, but still should've been done separately.
| @@ -0,0 +1,4 @@ | |||
|
|
|||
| set(_cfg_dir "C:/Users/Yong/Documents/SCIRun/build/Externals/Install/Tny_external/lib/cmake/Tny") | |||
|
Python crashes on Mac:
|
| ) | ||
| endif() | ||
| TARGET_LINK_LIBRARIES(Interface_Modules_Math | ||
| Qt::Svg |
# Conflicts: # src/Core/Python/PythonInterpreter.cc
|
python runs without crash on mac |
Confirmed on my Macbook Air M4 |

Built on Windows 10 with Visual Studio 2022.
Runs on Windows.
Some issues with vector out of bound, possibly initialization issues and qt related.