Changeset 5958ed7 in OpenModelica


Ignore:
Timestamp:
2020-10-21T14:04:16+02:00 (3 years ago)
Author:
Mahder Gebremedhin <mahder.gebremedhin@…>
Children:
041ceef
Parents:
0846120c
git-author:
Mahder Gebremedhin <mahder.gebremedhin@…> (09/07/20 21:20:46)
git-committer:
Mahder Gebremedhin <mahder.gebremedhin@…> (10/21/20 14:04:16)
Message:

[cmake] Prefix sundials cmake variables.

  • BUILD_STATIC_LIBS -> SUNDIALS_BUILD_STATIC_LIBS

This is to avoid conflicts with other libraries.

Location:
OMCompiler
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • OMCompiler/Makefile.in

    r334de41 r5958ed7  
    175175  test -d 3rdParty/sundials
    176176
    177   (test -f $@ && test -d 3rdParty/sundials/build_msvc) || (rm -rf 3rdParty/sundials/build_msvc && mkdir -p 3rdParty/sundials/build_msvc && cd 3rdParty/sundials/build_msvc && $(WINE) "$(OMDEV_CMAKE)" -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DBUILD_STATIC_LIBS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=. ../ -G  "NMake Makefiles" && $(WINE) nmake /f Makefile install)
     177  (test -f $@ && test -d 3rdParty/sundials/build_msvc) || (rm -rf 3rdParty/sundials/build_msvc && mkdir -p 3rdParty/sundials/build_msvc && cd 3rdParty/sundials/build_msvc && $(WINE) "$(OMDEV_CMAKE)" -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DSUNDIALS_BUILD_STATIC_LIBS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=. ../ -G  "NMake Makefiles" && $(WINE) nmake /f Makefile install)
    178178  mkdir -p $(OMBUILDDIR)/include/omc/msvc/sundials
    179179  (cp -pufr 3rdParty/sundials/build_msvc/include/* $(OMBUILDDIR)/include/omc/msvc/sundials)

  • OMCompiler/Makefile.omdev.mingw

    ra9b0f251 r5958ed7  
    430430  echo call '"${VSCOMNTOOLS}\\..\\..\\VC\\vcvarsall.bat" ${VCVARS_PARAMS}' >> 3rdParty/sundials/build_msvc/build.bat
    431431  echo echo Calling CMake >> 3rdParty/sundials/build_msvc/build.bat
    432   echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DBUILD_STATIC_LIBS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=. ../ -G  "NMake Makefiles JOM" -D"CMAKE_MAKE_PROGRAM:PATH=%OMDEV%\\tools\\jom\\jom.exe"' >> 3rdParty/sundials/build_msvc/build.bat
     432  echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DSUNDIALS_BUILD_STATIC_LIBS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=. ../ -G  "NMake Makefiles JOM" -D"CMAKE_MAKE_PROGRAM:PATH=%OMDEV%\\tools\\jom\\jom.exe"' >> 3rdParty/sundials/build_msvc/build.bat
    433433  echo echo Building sundials >> 3rdParty/sundials/build_msvc/build.bat
    434434  echo @echo on >> 3rdParty/sundials/build_msvc/build.bat
Note: See TracChangeset for help on using the changeset viewer.