From d629cc7d2479188c4cad05e0dfc965be28623b34 Mon Sep 17 00:00:00 2001 From: Mahder Gebremedhin Date: Tue, 15 Aug 2023 13:48:25 +0200 Subject: [PATCH] Adjust configuration to fit well with OpenModelica. - OMSimulator standalone has no issues and works just fine. However, we need to consider some things when it is being built as part of OpenModelica. - Sindials exists in OpenModelica's 3rdParty as well as OMSimulator's 3rdParty. It creates the same named targets in both. This is not allowed. So if OMSimulator is part of OpenModelica (not standalone) skip adding its 3rdParty/Sundials and just use the targets already added by OpenModelica. Just create aliases for them. - FMIL continues to create issues as usual. This time from across the horizon. FMIL comes with `minizip `(among other things) and uses it in the usual contrived FMIL way. OMSimulator also comes with its own `minizip`. So, as a workaround, just rename OMSimulator's `minizip` to `oms_minizip` and use it with that name. It should be fine since it is only used locally and is not supposed to be installed anyway. --- 3rdParty | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/3rdParty b/3rdParty index a6bb3488e..6a455d042 160000 --- a/3rdParty +++ b/3rdParty @@ -1 +1 @@ -Subproject commit a6bb3488e30501f578279a2b5a62fc3f39f645bd +Subproject commit 6a455d042f8759fadc21eefaf7498e9b09da4486 diff --git a/CMakeLists.txt b/CMakeLists.txt index 04f6d4844..284a8740f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ message("cmake version is: ${CMAKE_VERSION}") cmake_minimum_required(VERSION 3.14) project(OMSimulator) -list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/config.cmake/") +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/config.cmake/") ### Standards ###############################################################################################