Skip to content

#5574 - Missing @loader_path/../lib in openstudio.bundle #5583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anchapin merged 3 commits into from
Jan 9, 2026
Merged

#5574 - Missing @loader_path/../lib in openstudio.bundle #5583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
547873a
Potential fix for #5574
jmarrec Jan 8, 2026
3949629
Remove rpath cmake configure arguments
jmarrec Jan 8, 2026
8d2cc89
fix: Update Jenkins library reference to boost compatibility
Jan 9, 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
2 changes: 0 additions & 2 deletions .github/workflows/full-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,6 @@ jobs:
-DPython_EXECUTABLE:FILEPATH="$SYSTEM_PYTHON_PATH" \
-DPYTHON_VERSION:STRING=${{ env.PYTHON_REQUIRED_VERSION }} \
-DSYSTEM_RUBY_EXECUTABLE="$SYSTEM_RUBY_PATH" \
-DCMAKE_INSTALL_RPATH='$ORIGIN;$ORIGIN/../lib' \
-DCMAKE_JOB_POOL_LINK:STRING=console \
"$GITHUB_WORKSPACE"

Expand Down Expand Up @@ -856,7 +855,6 @@ jobs:
-DCPACK_BINARY_IFW:BOOL=ON \
-DBUILD_PYTHON_BINDINGS:BOOL=ON \
-DBUILD_PYTHON_PIP_PACKAGE:BOOL=OFF \
-DCMAKE_INSTALL_RPATH="@loader_path;@executable_path;@loader_path/../lib" \
-DPYTHON_VERSION:STRING=${{ env.PYTHON_REQUIRED_VERSION }} \
-DPython_ROOT_DIR:PATH="$(dirname $(dirname $SYSTEM_PYTHON_PATH))" \
-DCMAKE_JOB_POOL_LINK:STRING=console \
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile_develop_osx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//Jenkins pipelines are stored in shared libaries. Please see: https://github.com/NREL/cbci_jenkins_libs

@Library('cbci_shared_libs') _
@Library('cbci_shared_libs@boost_compatibility') _

// Build for PR to develop branch only.
if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) {
Expand Down
14 changes: 1 addition & 13 deletions src/modelica/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
set(openstudio_modelica_depends
antlr4_static
${openstudio_utilities_depends}
)
set(openstudio_modelica_depends ${openstudio_modelica_depends} PARENT_SCOPE)

Expand Down Expand Up @@ -28,7 +29,6 @@ add_library(openstudio_modelica
target_link_libraries(openstudio_modelica
PUBLIC
${openstudio_modelica_depends}
openstudio_utilities
)

target_compile_definitions(openstudio_modelica
Expand All @@ -44,18 +44,6 @@ set(openstudio_modelica_swig_src
#macro(MAKE_SWIG_TARGET NAME SIMPLENAME KEY_I_FILE I_FILES PARENT_TARGET PARENT_SWIG_TARGETS)
MAKE_SWIG_TARGET(OpenStudioModelica modelica "${CMAKE_CURRENT_SOURCE_DIR}/Modelica.i" "${openstudio_modelica_swig_src}" openstudio_modelica OpenStudioUtilities)

if(TARGET ruby_OpenStudioModelica)
target_link_libraries(ruby_OpenStudioModelica openstudiolib)
endif()

if(TARGET python_OpenStudioModelica)
target_link_libraries(python_OpenStudioModelica PUBLIC openstudiolib)
endif()

if(TARGET python_package_OpenStudioModelica)
target_link_libraries(python_package_OpenStudioModelica PUBLIC openstudiolib)
endif()

add_executable(antdemo
main.cpp
)
Expand Down