Group Vishnu commands in a single session

[tools/libbatch.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b91a7e8a9d2443abc54f1aeb8ec2489874642d09..e88e9743f614a333fc3a69cc5d2af199f33e0b62 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-#  Copyright (C) 2007-2008  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
@@ -38,7 +38,11 @@ MACRO(APPEND_CLASSES_TO_HDR_FILES)
     ENDFOREACH(CLASS ${ARGV})
 ENDMACRO(APPEND_CLASSES_TO_HDR_FILES)
 
+IF (MSVC)
+  add_definitions(/wd4251 /wd4290)  # Disable annoying Visual C++ warnings
+ENDIF (MSVC)
 
+include_directories(${PTHREAD_INCLUDE_DIR})
 
 add_subdirectory (Core)
 
@@ -46,9 +50,18 @@ IF (BUILD_LOCAL_SUBMISSION)
     add_subdirectory (Local)
 ENDIF (BUILD_LOCAL_SUBMISSION)
 
+add_subdirectory (CCC)
 add_subdirectory (LSF)
 add_subdirectory (PBS)
 add_subdirectory (SGE)
+add_subdirectory (SSH)
+add_subdirectory (LoadLeveler)
+add_subdirectory (Slurm)
+
+# Vishnu is not available for Windows
+IF (NOT WIN32)
+    add_subdirectory (Vishnu)
+ENDIF (NOT WIN32)
 
 # Make a copy of the built value and clear the built value for the next run of cmake
 SET(SRC_FILES ${SRC_FILES_BUILD} CACHE INTERNAL "")
@@ -58,13 +71,15 @@ SET(HDR_FILES ${HDR_FILES_BUILD} CACHE INTERNAL "")
 SET(HDR_FILES_BUILD CACHE INTERNAL "")
 
 
-
 add_library (Batch SHARED ${SRC_FILES})
 
-include_directories(${CMAKE_BINARY_DIR})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Core)
+include_directories(${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/Core)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Local)
+target_link_libraries(Batch ${PTHREAD_LIBRARY})
 
-target_link_libraries(Batch ${CMAKE_THREAD_LIBS_INIT})
+IF (WIN32)
+    target_link_libraries(Batch ws2_32)
+ENDIF (WIN32)
 
 # If necessary, activate all warnings (useful for debugging and code cleaning)
 # add_definitions(-Wall -Werror -ansi -pedantic)
@@ -82,6 +97,6 @@ ENDIF (BUILD_PBS_INTERFACE AND PBS_FOUND)
 INSTALL(TARGETS Batch DESTINATION lib)
 INSTALL(FILES ${HDR_FILES} DESTINATION include/Batch)
 
-IF (BUILD_PYTHON_WRAPPING AND PYTHON_INCLUDE_PATH AND PYTHON_LIBRARIES AND SWIG_FOUND)
+IF (BUILD_PYTHON_WRAPPING AND Python_FOUND AND SWIG_FOUND)
     add_subdirectory (Python)
-ENDIF (BUILD_PYTHON_WRAPPING AND PYTHON_INCLUDE_PATH AND PYTHON_LIBRARIES AND SWIG_FOUND)
+ENDIF (BUILD_PYTHON_WRAPPING AND Python_FOUND AND SWIG_FOUND)