Upgrade version number

[tools/libbatch.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed01c342cd3384fd50d447db0cb731e7bbb34181..243c275638fc63872d23fd68d7e623ef8b0fb518 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -22,14 +22,12 @@
 
 project (libBatch)
 
-cmake_minimum_required (VERSION 2.4)
+cmake_minimum_required (VERSION 2.8)
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules/)
 
 find_package (PThread REQUIRED)
 find_package (Makeinfo)
 
-SET (BUILD_LSF_INTERFACE TRUE CACHE BOOL "Build interface for LSF batch system")
-SET (BUILD_PBS_INTERFACE TRUE CACHE BOOL "Build interface for PBS batch system")
 SET (BUILD_LOCAL_SUBMISSION TRUE CACHE BOOL "Build classes for local submission")
 SET (BUILD_PYTHON_WRAPPING TRUE CACHE BOOL "Generate Python wrapping")
 SET (TEST_ENABLED FALSE CACHE BOOL "Enable testing")
@@ -38,20 +36,25 @@ IF (TEST_ENABLED)
     ENABLE_TESTING()
 ENDIF (TEST_ENABLED)
 
-IF (BUILD_LSF_INTERFACE)
-    find_package (LSF)
-ENDIF (BUILD_LSF_INTERFACE)
-IF (BUILD_PBS_INTERFACE)
-    find_package (PBS)
-ENDIF (BUILD_PBS_INTERFACE)
 IF (BUILD_LOCAL_SUBMISSION)
     find_package (Local)
 ENDIF (BUILD_LOCAL_SUBMISSION)
 IF (BUILD_PYTHON_WRAPPING)
-    FIND_PACKAGE(Python)
+    FIND_PACKAGE(PythonInterp)
+    SET(PythonLibs_FIND_VERSION ${PYTHON_VERSION_STRING})
+    FIND_PACKAGE(PythonLibs)
     FIND_PACKAGE(SWIG)
 ENDIF (BUILD_PYTHON_WRAPPING)
 
+SET(CPACK_GENERATOR TGZ)
+SET(CPACK_SOURCE_GENERATOR TGZ ZIP)
+SET(CPACK_PACKAGE_VERSION_MAJOR 2)
+SET(CPACK_PACKAGE_VERSION_MINOR 0)
+SET(CPACK_PACKAGE_VERSION_PATCH 0)
+SET(CPACK_SOURCE_IGNORE_FILES /\\\\.;/CVS/;~)
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME
+    ${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
+
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Batch_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/Batch_config.h)
 
 INCLUDE(Summary)
@@ -64,14 +67,6 @@ ENDIF (Makeinfo_FOUND)
 
 add_subdirectory (misc)
 
-SET(CPACK_GENERATOR TGZ)
-SET(CPACK_SOURCE_GENERATOR TGZ ZIP)
-SET(CPACK_PACKAGE_VERSION_MAJOR 1)
-SET(CPACK_PACKAGE_VERSION_MINOR 1)
-SET(CPACK_PACKAGE_VERSION_PATCH 0)
-SET(CPACK_SOURCE_IGNORE_FILES /\\\\.;/CVS/;~)
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME
-    ${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 INCLUDE(CPack)
 
 MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY EXECUTABLE_OUTPUT_PATH)