- changed minimum cmake version to 2.8.6

- changed DIRECTORY to PATH keyword, because this is not available in CMake < 2.8.11 (this should fix the linux nightly build) git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25242 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 25, 2015 · ea7c1aa · ea7c1aa
1 parent 1a00971
commit ea7c1aa
Show file tree

Hide file tree

Showing 22 changed files with 26 additions and 24 deletions.
diff --git a/SimulationRuntime/cpp/CMake/FindSuiteSparse.cmake b/SimulationRuntime/cpp/CMake/FindSuiteSparse.cmake
@@ -90,5 +90,5 @@ ELSE(UMFPACK_H_OMC AND UMFPACK_LIB_OMC)
 		SET(SUITESPARSE_UMFPACK_FOUND false)
 		MESSAGE(STATUS "Could not find amd library")
 	ENDIF(AMD_LIB AND UMFPACK_LIB AND UMFPACK_H)
-	GET_FILENAME_COMPONENT(SUITESPARSE_UMFPACK_LIBS "${UMFPACK_LIB}" DIRECTORY)
+	GET_FILENAME_COMPONENT(SUITESPARSE_UMFPACK_LIBS "${UMFPACK_LIB}" PATH)
 ENDIF(UMFPACK_H_OMC AND UFCONFIG_H_OMC AND UMFPACK_LIB_OMC AND AMD_LIB_OMC)
diff --git a/SimulationRuntime/cpp/CMake/FindTBB.cmake b/SimulationRuntime/cpp/CMake/FindTBB.cmake
@@ -156,7 +156,7 @@ endif (_TBB_DEFAULT_INSTALL_DIR)
 endif (NOT _TBB_INSTALL_DIR)
 # sanity check
 if (NOT _TBB_INSTALL_DIR)
-message ("ERROR: Unable to find Intel TBB install directory. ${_TBB_INSTALL_DIR}")
+message (STATUS "Unable to find Intel TBB install directory. ${_TBB_INSTALL_DIR}")
 else (NOT _TBB_INSTALL_DIR)
 # finally: set the cached CMake variable TBB_INSTALL_DIR
 if (NOT TBB_INSTALL_DIR)

diff --git a/SimulationRuntime/cpp/CMakeLists.txt b/SimulationRuntime/cpp/CMakeLists.txt
@@ -23,11 +23,13 @@
 #
 # The used defines are stored in the SYSTEM_CFLAGS variable, which is passed to the ModelicaConfig.inc and written in the PrecompiledHeader.cmake
 
-CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED (VERSION 2.8.6)
 PROJECT(CppSolverInterface)
 
 LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake")
 
+MESSAGE(STATUS "CMake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
+
 #Set Options
 OPTION(RUNTIME_STATIC_LINKING "RUNTIME_STATIC_LINKING" OFF)
 OPTION(USE_PARALLEL_OUTPUT "USE_PARALLEL_OUTPUT" OFF)
@@ -267,7 +269,7 @@ ENDIF(mkl_rt)
 LIST(LENGTH LAPACK_LIBRARIES LAPACKVARCOUNT)
 IF(LAPACKVARCOUNT GREATER 0)
   LIST(GET LAPACK_LIBRARIES 0 LAPACKLISTHEAD)
-  GET_FILENAME_COMPONENT(LAPACKLISTHEAD "${LAPACKLISTHEAD}" DIRECTORY)
+  GET_FILENAME_COMPONENT(LAPACKLISTHEAD "${LAPACKLISTHEAD}" PATH)
   SET(LAPACK_LIBS "${LAPACKLISTHEAD}")
 ENDIF()
 
@@ -287,7 +289,7 @@ IF(USE_SUNDIALS)
   IF(NOT SUNDIALS_NVECSERIAL_LIB)
 		MESSAGE(FATAL_ERROR "Could not find libsundials_nvecserial!")
   ENDIF()
-  GET_FILENAME_COMPONENT(SUNDIALS_LIBS "${SUNDIALS_NVECSERIAL_LIB}" DIRECTORY)
+  GET_FILENAME_COMPONENT(SUNDIALS_LIBS "${SUNDIALS_NVECSERIAL_LIB}" PATH)
 
   FIND_LIBRARY(SUNDIALS_CVODES_LIB "sundials_cvodes" PATHS ${SUNDIALS_LIBRARY_RELEASE_HOME}  $ENV{SUNDIALS_ROOT}/lib)
   IF(NOT SUNDIALS_CVODES_LIB)

diff --git a/SimulationRuntime/cpp/Core/DataExchange/CMakeLists.txt b/SimulationRuntime/cpp/Core/DataExchange/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.6)
 
 project(${DataExchangeName})
 

diff --git a/SimulationRuntime/cpp/Core/Math/CMakeLists.txt b/SimulationRuntime/cpp/Core/Math/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.6)
 
 project(${MathName})
 # add the solver default implementation library

diff --git a/SimulationRuntime/cpp/Core/Modelica/CMakeLists.txt b/SimulationRuntime/cpp/Core/Modelica/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.11)
 
 project(${ModelicaName})
 

diff --git a/SimulationRuntime/cpp/Core/ModelicaExternalC/CMakeLists.txt b/SimulationRuntime/cpp/Core/ModelicaExternalC/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.6)
 
 project(${ModelicaExternalName})
 include_directories (${MODELICAEXTERNALCDIR})

diff --git a/SimulationRuntime/cpp/Core/SimController/CMakeLists.txt b/SimulationRuntime/cpp/Core/SimController/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.6)
 
 project(${SimControllerName})
 

diff --git a/SimulationRuntime/cpp/Core/SimulationSettings/CMakeLists.txt b/SimulationRuntime/cpp/Core/SimulationSettings/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.6)
 
 project(${SimulationSettings})
 # add the solver default implementation library

diff --git a/SimulationRuntime/cpp/Core/Solver/CMakeLists.txt b/SimulationRuntime/cpp/Core/Solver/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.6)
 
 project(${SolverName})
 

diff --git a/SimulationRuntime/cpp/Core/System/CMakeLists.txt b/SimulationRuntime/cpp/Core/System/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.6)
 
 project(${SystemName})
 set(BASE_LIB "" CACHE INTERNAL "" )

diff --git a/SimulationRuntime/cpp/Core/Utils/Modelica/CMakeLists.txt b/SimulationRuntime/cpp/Core/Utils/Modelica/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.6)
 
 project(${ModelicaUtilitiesName})
 # add the solver default implementation library

diff --git a/SimulationRuntime/cpp/Core/Utils/extension/CMakeLists.txt b/SimulationRuntime/cpp/Core/Utils/extension/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.6)
 
 project(${ExtensionUtilitiesName})
 IF(RUNTIME_STATIC_LINKING)

diff --git a/SimulationRuntime/cpp/SimCoreFactory/OMCFactory/CMakeLists.txt b/SimulationRuntime/cpp/SimCoreFactory/OMCFactory/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.6)
 
 project(${OMCFactoryName})
 

diff --git a/SimulationRuntime/cpp/Solver/CVode/CMakeLists.txt b/SimulationRuntime/cpp/Solver/CVode/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.6)
 
 project(${CVodeName})
 include_directories(${SUNDIALS_INCLUDE_DIR}/cvodes ${SUNDIALS_INCLUDE_DIR}/nvector  ${SUNDIALS_INCLUDE_DIR}/sundials ${SUNDIALS_INCLUDE_DIR})

diff --git a/SimulationRuntime/cpp/Solver/Euler/CMakeLists.txt b/SimulationRuntime/cpp/Solver/Euler/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.6)
 
 project(${EulerName})
 # add the solver default implementation library

diff --git a/SimulationRuntime/cpp/Solver/Hybrj/CMakeLists.txt b/SimulationRuntime/cpp/Solver/Hybrj/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.6)
 
 project(${HybrjName})
 # add the solver default implementation library

diff --git a/SimulationRuntime/cpp/Solver/IDA/CMakeLists.txt b/SimulationRuntime/cpp/Solver/IDA/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.6)
 
 project(${IDAName})
 include_directories(${SUNDIALS_INCLUDE_DIR}/ida ${SUNDIALS_INCLUDE_DIR}/nvector  ${SUNDIALS_INCLUDE_DIR}/sundials ${SUNDIALS_INCLUDE_DIR})

diff --git a/SimulationRuntime/cpp/Solver/Kinsol/CMakeLists.txt b/SimulationRuntime/cpp/Solver/Kinsol/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.6)
 
 project(${KinsolName})
 include_directories(${SUNDIALS_INCLUDE_DIR}/kinsol ${SUNDIALS_INCLUDE_DIR}/nvector  ${SUNDIALS_INCLUDE_DIR}/sundials ${SUNDIALS_INCLUDE_DIR})

diff --git a/SimulationRuntime/cpp/Solver/Newton/CMakeLists.txt b/SimulationRuntime/cpp/Solver/Newton/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.6)
 
 project(${NewtonName})
 

diff --git a/SimulationRuntime/cpp/Solver/Peer/CMakeLists.txt b/SimulationRuntime/cpp/Solver/Peer/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.6)
 
 project(${PeerName})
 

diff --git a/SimulationRuntime/cpp/Solver/UmfPack/CMakeLists.txt b/SimulationRuntime/cpp/Solver/UmfPack/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.6)
 
 project(${UmfPackName})