Some refactoring in batch manager eLSF to use method getCommandOutput instead of...

[tools/libbatch.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0fa11d89079116e9f43adf0e860a51dcf062de70..304734d4eac20926ab66f1914bc4c6ff54b53fb3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2011  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
@@ -25,19 +25,18 @@ project (libBatch)
 cmake_minimum_required (VERSION 2.4)
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules/)
 
-ENABLE_TESTING()
-
-find_package (PLATFORM)
-find_package (Threads)
-IF (NOT CMAKE_USE_PTHREADS_INIT)
-    MESSAGE(FATAL_ERROR "Mandatory library pthread not found")
-ENDIF (NOT CMAKE_USE_PTHREADS_INIT)
+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")
+
+IF (TEST_ENABLED)
+    ENABLE_TESTING()
+ENDIF (TEST_ENABLED)
 
 IF (BUILD_LSF_INTERFACE)
     find_package (LSF)
@@ -53,6 +52,15 @@ IF (BUILD_PYTHON_WRAPPING)
     FIND_PACKAGE(SWIG)
 ENDIF (BUILD_PYTHON_WRAPPING)
 
+SET(CPACK_GENERATOR TGZ)
+SET(CPACK_SOURCE_GENERATOR TGZ ZIP)
+SET(CPACK_PACKAGE_VERSION_MAJOR 1)
+SET(CPACK_PACKAGE_VERSION_MINOR 4)
+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)
@@ -63,14 +71,8 @@ IF (Makeinfo_FOUND)
     add_subdirectory (doc)
 ENDIF (Makeinfo_FOUND)
 
-SET(CPACK_GENERATOR TGZ)
-SET(CPACK_SOURCE_GENERATOR TGZ)
-SET(CPACK_PACKAGE_VERSION_MAJOR 1)
-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})
+add_subdirectory (misc)
+
 INCLUDE(CPack)
 
 MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY EXECUTABLE_OUTPUT_PATH)