CMake-based v3.2.1 #25

jowr · 2021-01-06T10:11:27Z

Changes in this PR:

Fixed the compilation issues with the ExternalMedia library
Added a download link for CoolProp v5.1.1
Requires CMake for compilation, but has been tested with the old CMake from the OMDev environment
Some of the examples work with OpenModelica, but the topics discussed in v3.2.3 with CoolProp #24 also appear here.

General comments:

There is a new PR coming up that fixes the documentation, please only review the CompilationHowTo help file.
Maybe we can merge this to the master branch since it is only a fix for version v3.2.1. It is not related to v3.3.0

- Added a download link for CoolProp v5.1.1

jowr · 2021-01-06T12:01:52Z

In case anyone is interested: The binaries produced by https://github.com/jowr/ExternalMedia/actions/runs/465940532 can be found here:
https://ipudk-my.sharepoint.com/:u:/g/personal/jowr_ipu_dk/ET6Lc5G_B6JLtHDMfDOwa9kBHKzZ3aiHc-mdIKn1hZe1MA?e=5dj5nW

jowr · 2021-01-06T18:41:36Z

Just for the records, this PR potentially fixes #5, #7, #8, #14, #15, #21, #22.

However, the problems with OpenModelica (#9, #10 and #24) seem to be caused by the translation step and are not addressed here.

jowr · 2021-01-11T07:52:00Z

Dear @casella - could you please share your thoughts on this contribution? It closes a lot of issues and I have the next PR ready to fix the documentation, but this one should be merged first... Let me know if you want anything modified.

beutlich

Successfully tested that build works with VS2010.

beutlich · 2021-01-20T22:57:35Z

Projects/CMakeLists.txt

+  list (APPEND INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/../externals/CoolProp.git/externals/cppformat")
+else()
+  list(REMOVE_ITEM LIB_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/Sources/coolpropsolver.cpp")
+endif()

 ## We use CMake to handle the dependency since the primary VCS for 
 ## ExternalMedia still is SVN.


I guess, this comment is outdated.

Yep, I am going to remove it.

beutlich · 2021-01-20T22:58:26Z

Projects/CompilationHowTo.txt

@@ -4,68 +4,36 @@ This directory contains the C/C++ source files in the Sources directory
 and script files to build the library using different Modelica tools,
 operating systems, and C/C++ compilers.

+Instructions below build the static gcc library and copy it and the
+externalmedia.h header files in the Resource directories of the


Suggested change

externalmedia.h header files in the Resource directories of the

externalmedia.h header files in the Resources directories of the

Please do not waste time on the docs. I have a new PR lined up that fixes the docs, but this one has to be merged first.

beutlich · 2021-01-20T22:58:43Z

Projects/CompilationHowTo.txt

@@ -4,68 +4,36 @@ This directory contains the C/C++ source files in the Sources directory
 and script files to build the library using different Modelica tools,
 operating systems, and C/C++ compilers.

+Instructions below build the static gcc library and copy it and the


Suggested change

Instructions below build the static gcc library and copy it and the

Instructions below build the static library and copy it and the

Please do not waste time on the docs. I have a new PR lined up that fixes the docs, but this one has to be merged first.

beutlich · 2021-01-20T22:58:50Z

Projects/CompilationHowTo.txt

+Instructions below build the static gcc library and copy it and the
+externalmedia.h header files in the Resource directories of the
+Modelica packages, so it can be used right away by just loading the
+package in you Modelica software.


Suggested change

package in you Modelica software.

package in your Modelica software.

Please do not waste time on the docs. I have a new PR lined up that fixes the docs, but this one has to be merged first.

beutlich · 2021-01-20T23:01:16Z

Projects/BuildLib-CMake.bat

-pushd "%EXTERNALS%"
-set CP_SRC=!CD!\CoolProp.git
-popd 
-
 set BUILD_DIR="build"
 if not exist "%BUILD_DIR%" (mkdir "%BUILD_DIR%")


If build dir exists and I previously built MSVC for "x64" a subesequent build for "Win32" will use the same build dir and fails.

Yes, we may want to remove the script since the whole installation process now only needs 2 CMake commands.

Indeed, I noticed when checking the CI part which is pretty impressive,

casella

@jowr, sorry for the delay and thank you for your patience. Now I have this think on the table.

I'll merge this and test it, and then report.

Thank you for the hard work!

casella · 2021-02-26T17:58:22Z

@jowr, now that I look closer, I guess this PR was meant to be merged on master, not on v.3.3.0-dev, right? After merging it, v.3.3.0-dev is mostly broken. We probably need to revert it.

Can we have a short webmeeting next week to coordinate? Now I finally have time to devote to ExternalMedia, and I can also get help from @fedetft, my local linux guru. I hope you also have some time now, so we can get this through

Thanks!

jowr added 4 commits January 6, 2021 10:56

- Fixed the compilation issues with the old ExternalMedia

3e86bb2

- Added a download link for CoolProp v5.1.1

Add a CI workflow

70ab396

Make the externals directory

112f81d

Remove FluidProp on Mac and Linux

aa08bb8

jowr added 2 commits January 7, 2021 16:21

Do not rely on external unzip calls

8ed5d85

Remove the comment that is mentioned in modelica-3rdparty#20

de09253

beutlich requested a review from casella January 16, 2021 13:20

beutlich reviewed Jan 20, 2021

View reviewed changes

casella approved these changes Feb 26, 2021

View reviewed changes

casella merged commit e81bb92 into modelica-3rdparty:v.3.3.0-dev Feb 26, 2021

jowr deleted the v3.2.1-compilation_fix branch March 9, 2021 21:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CMake-based v3.2.1 #25

CMake-based v3.2.1 #25

jowr commented Jan 6, 2021

jowr commented Jan 6, 2021

jowr commented Jan 6, 2021

jowr commented Jan 11, 2021

beutlich left a comment

beutlich Jan 20, 2021

jowr Jan 21, 2021

beutlich Jan 20, 2021

jowr Jan 21, 2021

beutlich Jan 20, 2021

jowr Jan 21, 2021

beutlich Jan 20, 2021

jowr Jan 21, 2021

beutlich Jan 20, 2021 •

edited

Loading

jowr Jan 21, 2021

beutlich Jan 21, 2021

casella left a comment

casella commented Feb 26, 2021

	externalmedia.h header files in the Resource directories of the
	externalmedia.h header files in the Resources directories of the

	Instructions below build the static gcc library and copy it and the
	Instructions below build the static library and copy it and the

	package in you Modelica software.
	package in your Modelica software.

CMake-based v3.2.1 #25

CMake-based v3.2.1 #25

Conversation

jowr commented Jan 6, 2021

jowr commented Jan 6, 2021

jowr commented Jan 6, 2021

jowr commented Jan 11, 2021

beutlich left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

beutlich Jan 20, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

casella left a comment

Choose a reason for hiding this comment

casella commented Feb 26, 2021

beutlich Jan 20, 2021 •

edited

Loading