Skip to content

Commit

Permalink
Update detection of sundials in the build directory (#6942)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sjoelund
sjoelund committed Nov 16, 2020
1 parent dc1bf4d commit 6e5a545
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion OMCompiler/SimulationRuntime/OMSI/solver/CMakeLists.txt
View file
Expand Up @@ -55,7 +55,13 @@ GET_FILENAME_COMPONENT(SUNDIALS_PATH "${SUNDIALS_PATH}" ABSOLUTE)
MESSAGE(STATUS "Sundials PATH:")
MESSAGE(STATUS "${SUNDIALS_PATH}")

FIND_PATH(SUNDIALS_LIB_DIR NAMES sundials_nvecserial libsundials_nvecserial sundials_nvecserial.dll libsundials_nvecserial.so sundials_nvecserial.a libsundials_nvecserial.a sundials_nvecserial.lib PATHS ${SUNDIALS_PATH}/lib ${SUNDIALS_PATH}/lib64)
file(GLOB
SUNDIALS_POTENTIAL_LIBS
LIST_DIRECTORIES true
${SUNDIALS_PATH}/lib*/* ${SUNDIALS_PATH}/lib*
)

FIND_PATH(SUNDIALS_LIB_DIR NAMES sundials_nvecserial libsundials_nvecserial sundials_nvecserial.dll libsundials_nvecserial.so sundials_nvecserial.a libsundials_nvecserial.a sundials_nvecserial.lib PATHS ${SUNDIALS_POTENTIAL_LIBS} )

MESSAGE(STATUS "Sundials libs:")
MESSAGE(STATUS "${SUNDIALS_LIB_DIR}")
Expand Down

4 comments on commit 6e5a545

@AnHeuermann
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a place in the OMSICpp CMakeLists.txt (https://github.com/OpenModelica/OpenModelica/blob/master/OMCompiler/SimulationRuntime/OMSICpp/CMakeLists.txt#L550) where SUNDIALS is searced in a similar way.
@sjoelund Did you test if that needs changes for xenial and el8 as well?

@sjoelund
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I couldn't test that :)

@AnHeuermann
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can try on dev.openmodelica.org with Docker today and see what will happen. But on Friday it worked with Xenial for me, so I'm not sure what the difference compared to Jenkins is.

@sjoelund
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll need to build using dpkg because Jenkins does compile on xenial already. But with different settings passed along...

Please sign in to comment.