Move Sundials paths to Sundials section (ticket:3933)

OpenModelica · Jun 4, 2016 · 86e2894 · 86e2894
1 parent dd39b9f
commit 86e2894
Showing 1 changed file with 13 additions and 18 deletions.
diff --git a/SimulationRuntime/cpp/CMakeLists.txt b/SimulationRuntime/cpp/CMakeLists.txt
@@ -321,27 +321,9 @@ IF(WIN32)
   SET(MICO_LIB_HOME $ENV{OMDEV}/lib/mico-msys-mingw/)
   SET(MICO_INCLUDE_HOME  $ENV{OMDEV}/include/mico-msys-mingw/)
 
-
-
-
-
-
   SET(INSTALL_OMDEV_LIBS ON)
 ENDIF(WIN32)
 
-#set sundials solvers include and library directories
-IF(MSVC)
- SET(Sundials_Path "${CMAKE_SOURCE_DIR}/../../3rdParty/sundials/build_msvc")
-ELSE(MSVC)
- SET(Sundials_Path "${CMAKE_SOURCE_DIR}/../../3rdParty/sundials/build")
-ENDIF(MSVC)
-SET(SUNDIALS_INLCUDE_HOME  ${Sundials_Path}/include)
-SET(SUNDIALS_LIBRARY_RELEASE_HOME  ${Sundials_Path}/lib)
-MESSAGE(STATUS "Sundials include:")
-MESSAGE(STATUS "${SUNDIALS_INLCUDE_HOME}")
-MESSAGE(STATUS "Sundials library:")
-MESSAGE(STATUS "${SUNDIALS_LIBRARY_RELEASE_HOME}")
-
 # Find OpenMP
 FIND_PACKAGE(OpenMP)
 IF(OPENMP_FOUND)
@@ -495,6 +477,19 @@ MESSAGE(STATUS ${LAPACK_LIBRARIES})
 
 # Find Sundials solvers
 IF(USE_SUNDIALS)
+  #set sundials solvers include and library directories
+  IF(MSVC)
+    SET(Sundials_Path "${CMAKE_SOURCE_DIR}/../../3rdParty/sundials/build_msvc")
+  ELSE(MSVC)
+    SET(Sundials_Path "${CMAKE_SOURCE_DIR}/../../3rdParty/sundials/build")
+  ENDIF(MSVC)
+  SET(SUNDIALS_INLCUDE_HOME  ${Sundials_Path}/include)
+  SET(SUNDIALS_LIBRARY_RELEASE_HOME  ${Sundials_Path}/lib)
+  MESSAGE(STATUS "Sundials include:")
+  MESSAGE(STATUS "${SUNDIALS_INLCUDE_HOME}")
+  MESSAGE(STATUS "Sundials library:")
+  MESSAGE(STATUS "${SUNDIALS_LIBRARY_RELEASE_HOME}")
+
   FIND_PATH(SUNDIALS_INCLUDE_DIR cvode/cvode.h PATHS ${SUNDIALS_INLCUDE_HOME} $ENV{SUNDIALS_ROOT}/include)
   IF (NOT SUNDIALS_INCLUDE_DIR)
     MESSAGE(FATAL_ERROR "Could not find Sundials, specify environment variable SUNDIALS_ROOT")