Changeset 16b92f9d in OpenModelica

Timestamp:

2020-10-21T14:04:17+02:00 (4 years ago)

Author:

Mahder Gebremedhin <mahder.gebremedhin@…>

Children:

577c0c0b

Parents:

2349d7b8

git-author:

Mahder Gebremedhin <mahder.gebremedhin@…> (09/23/20 21:32:59)

git-committer:

Mahder Gebremedhin <mahder.gebremedhin@…> (10/21/20 14:04:17)

Message:

[cmake] Install omc and libOpenModelicaCompiler.

• Install omc executable to the RUNTIME (default bin) directory.
• Install libOpenModelica compiler to the LIBRARY (lib) directory.
• Install ModelicaBuiltin files to the <LIBRARY>/omlibrary (lib/omlibrary) directory.

• Set the <install_prefix>/lib as an rpath dir to installed components.

• There are some fixes done to 3rdParty FMIL and CMinPack projects. FMI is adjusted to use CMAKE_INSTALL_PREFIX instead of its own fixed FMILIB_INSTALL_PREFIX. The decision where to install should be left to the user.

Check the 3rdParty submodule logs for more info.

Location:

OMCompiler

Files:

• 3rdParty (modified) (1 prop)
• CMakeLists.txt (modified) (1 diff)
• Compiler/CMakeLists.txt (modified) (2 diffs)
• Makefile.common (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• Makefile.omdev.mingw (modified) (1 diff)

OMCompiler/CMakeLists.txt

@@ -19 +19 @@
 endif(NOT CMAKE_BUILD_TYPE)
 omc_add_to_report(CMAKE_BUILD_TYPE)
+
+# Set the installation lib directory as an rpath for all installed
+# libs.
+# Maybe there is a better way to do this but it should suffice for now.
+SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
 
 

OMCompiler/Compiler/CMakeLists.txt

@@ -152 +152 @@
 add_dependencies(OpenModelicaCompiler DEPENDENCY_UPDATE)
 
+
 include_regular_expression("^$")
 # There is a lonely omc_file.h in Util/. It belongs in runtime/. Remove this when it is moved.
@@ -169 +170 @@
 
 
-
 # OMC Executable.
 add_executable(omc .cmake/omc_main.c)
 target_link_libraries(omc OpenModelicaCompiler)
+
+
+
+
+### INSTALLATION
+
+# Install OpenModelicaCompiler to the directory for LIBRARIES (default=lib)
+# Install omc to the directory for RUNTIME (default=bin)
+install(TARGETS omc OpenModelicaCompiler)
+
+# Install the *ModelicaBuiltin files to <library_dir>/omc/ that is where omc.exe expects them to be.
+install(FILES NFFrontEnd/NFModelicaBuiltin.mo DESTINATION ${CMAKE_INSTALL_LIBDIR}/omc)
+install(FILES FrontEnd/ModelicaBuiltin.mo DESTINATION ${CMAKE_INSTALL_LIBDIR}/omc)
+install(FILES FrontEnd/MetaModelicaBuiltin.mo DESTINATION ${CMAKE_INSTALL_LIBDIR}/omc)

OMCompiler/Makefile.common

@@ -358 +358 @@
   test -d 3rdParty/FMIL
   mkdir -p 3rdParty/FMIL/build
-  (cd 3rdParty/FMIL/build && test -f Makefile || CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(CMAKE) -D CMAKE_AR:String="$(AR)" $(MINGW_FMIL_FLAGS) -D FMILIB_BUILD_SHARED_LIB:Bool=$(FMILIB_SHARED) -D FMILIB_BUILD_TESTS:Bool=OFF -D FMILIB_GENERATE_DOXYGEN_DOC:Bool=OFF -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DFMILIB_INSTALL_PREFIX:String=../install .. -G $(CMAKE_TARGET))
+  (cd 3rdParty/FMIL/build && test -f Makefile || CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(CMAKE) -D CMAKE_AR:String="$(AR)" $(MINGW_FMIL_FLAGS) -D FMILIB_BUILD_SHARED_LIB:Bool=$(FMILIB_SHARED) -D FMILIB_BUILD_TESTS:Bool=OFF -D FMILIB_GENERATE_DOXYGEN_DOC:Bool=OFF -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DCMAKE_INSTALL_PREFIX:String=../install .. -G $(CMAKE_TARGET))
 
 # Install expat

OMCompiler/Makefile.in

@@ -159 +159 @@
   test -d 3rdParty/FMIL
 
-  (test -f $@ && test -d 3rdParty/FMIL/build_msvc && test -d 3rdParty/FMIL/install_msvc) || (rm -rf 3rdParty/FMIL/build_msvc && rm -rf 3rdParty/FMIL/install_msvc && mkdir -p 3rdParty/FMIL/build_msvc && cd 3rdParty/FMIL/build_msvc && $(WINE) "$(OMDEV_CMAKE)" -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DFMILIB_BUILD_TESTS=OFF -DFMILIB_BUILD_STATIC_LIB=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFMILIB_INSTALL_PREFIX=../install_msvc ../ -G  "NMake Makefiles" && $(WINE) nmake /f Makefile install)
+  (test -f $@ && test -d 3rdParty/FMIL/build_msvc && test -d 3rdParty/FMIL/install_msvc) || (rm -rf 3rdParty/FMIL/build_msvc && rm -rf 3rdParty/FMIL/install_msvc && mkdir -p 3rdParty/FMIL/build_msvc && cd 3rdParty/FMIL/build_msvc && $(WINE) "$(OMDEV_CMAKE)" -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DFMILIB_BUILD_TESTS=OFF -DFMILIB_BUILD_STATIC_LIB=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=../install_msvc ../ -G  "NMake Makefiles" && $(WINE) nmake /f Makefile install)
 
   (cp -puf 3rdParty/FMIL/install_msvc/lib/fmilib_shared.dll $(OMBUILDDIR)/lib/omc/msvc/fmilib.dll)

OMCompiler/Makefile.omdev.mingw

@@ -331 +331 @@
   echo call '"${VSCOMNTOOLS}\\..\\..\\VC\\vcvarsall.bat" ${VCVARS_PARAMS}' >> 3rdParty/FMIL/build_msvc/build.bat
   echo echo Calling CMake >> 3rdParty/FMIL/build_msvc/build.bat
-  echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DFMILIB_BUILD_TESTS=OFF -DFMILIB_BUILD_STATIC_LIB=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFMILIB_INSTALL_PREFIX=../install_msvc ../ -G  "NMake Makefiles" -D"CMAKE_MAKE_PROGRAM:PATH=%OMDEV%\\tools\\jom\\jom.exe"' >> 3rdParty/FMIL/build_msvc/build.bat
+  echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DFMILIB_BUILD_TESTS=OFF -DFMILIB_BUILD_STATIC_LIB=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=../install_msvc ../ -G  "NMake Makefiles" -D"CMAKE_MAKE_PROGRAM:PATH=%OMDEV%\\tools\\jom\\jom.exe"' >> 3rdParty/FMIL/build_msvc/build.bat
   echo @echo on >> 3rdParty/FMIL/build_msvc/build.bat
   echo set MAKE= >> 3rdParty/FMIL/build_msvc/build.bat