Skip to content

Commit

Permalink
- simple changes in the makefiles to activate ANALYZATION_MODE more e…
Browse files Browse the repository at this point in the history
…asily (Part 2)

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19845 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
Marcus Walther committed Mar 28, 2014
1 parent 8d9131f commit 3bed792
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
15 changes: 8 additions & 7 deletions SimulationRuntime/cpp/CMakeLists.txt
Expand Up @@ -2,13 +2,14 @@ cmake_minimum_required (VERSION 2.6)

project(CppSolverInterface)

option(ANALYZATIONMODE "ANALYZATIONMODE" OFF)
option(ANALYZATION_MODE "ANALYZATION_MODE" OFF)

IF(ANALYZATIONMODE)
IF(ANALYZATION_MODE)
message(STATUS "Using analyzation mode")
ELSE(ANALYZATIONMODE)
add_definitions(-DANALYZATION_MODE)
ELSE(ANALYZATION_MODE)
message(STATUS "Analyzation mode disabled")
ENDIF(ANALYZATIONMODE)
ENDIF(ANALYZATION_MODE)

# on windows boost,blas,lapack and sundial solvers from omdev is used else the installed versions are used
IF( WIN32 )
Expand Down Expand Up @@ -285,9 +286,9 @@ configure_file (


if(INSTALL_OMDEV_LIBS)
# if(USE_SUNDIALS)
# install (FILES "${SUNDIALS_NVECSERIAL_LIB}" "${SUNDIALS_IDAS_LIB}" "${SUNDIALS_IDA_LIB}" "${SUNDIALS_CVODES_LIB}" DESTINATION bin)
# endif()
#if(USE_SUNDIALS)
# install (FILES "${SUNDIALS_NVECSERIAL_LIB}" "${SUNDIALS_IDAS_LIB}" "${SUNDIALS_IDA_LIB}" "${SUNDIALS_CVODES_LIB}" DESTINATION bin)
#endif(USE_SUNDIALS)

if(USE_MICO)
install (FILES "${MICO_LIBRARY}" DESTINATION bin)
Expand Down
2 changes: 1 addition & 1 deletion SimulationRuntime/cpp/Makefile
Expand Up @@ -9,7 +9,7 @@ builddir_lib=$(top_builddir)/build/lib/omc
builddir_inc=$(top_builddir)/build/include/omc

runtimeCpp: clean
#cd ./Build && echo "change to Build" && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX:PATH="$(builddir_build)" ../
#cd ./Build && echo "change to Build" && cmake -D ANALYZATION_MODE=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX:PATH="$(builddir_build)" ../
cd ./Build && echo "change to Build" && cmake -D CMAKE_INSTALL_PREFIX:PATH="$(builddir_build)" ../
$(MAKE) -C Build

Expand Down

0 comments on commit 3bed792

Please sign in to comment.