From 17ff0e9f6a243ede85757f461e32e74a293b93b2 Mon Sep 17 00:00:00 2001
From: bruneton <bruneton>
Date: Mon, 24 Jun 2013 07:15:54 +0000
Subject: [PATCH] CMake: Renamed LIBBATCH_TESTS to LIBBATCH_BUILD_TESTS

---
 CMakeLists.txt                         | 4 ++--
 CMakeModules/FindLibbatchPThread.cmake | 2 +-
 INSTALL                                | 2 +-
 src/Core/CMakeLists.txt                | 2 +-
 src/Python/CMakeLists.txt              | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a0c7c6..7359c73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,9 +45,9 @@ SET(INSTALL_INCLUDE_DIR include)
 
 SET(LIBBATCH_LOCAL_SUBMISSION TRUE CACHE BOOL "Build classes for local submission")
 SET(LIBBATCH_PYTHON_WRAPPING TRUE CACHE BOOL "Generate Python wrapping")
-SET(LIBBATCH_TESTS FALSE CACHE BOOL "Enable testing")
+SET(LIBBATCH_BUILD_TESTS FALSE CACHE BOOL "Enable testing")
 
-IF(LIBBATCH_TESTS)
+IF(LIBBATCH_BUILD_TESTS)
   ENABLE_TESTING()
 ENDIF()
 IF(LIBBATCH_LOCAL_SUBMISSION)
diff --git a/CMakeModules/FindLibbatchPThread.cmake b/CMakeModules/FindLibbatchPThread.cmake
index f5d3bad..020ed06 100644
--- a/CMakeModules/FindLibbatchPThread.cmake
+++ b/CMakeModules/FindLibbatchPThread.cmake
@@ -24,5 +24,5 @@
 #  !! Please read the generic detection procedure in libbatchMacros.cmake !!
 #
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(PThread PTHREAD_INCLUDE_DIR 1)
-MARK_AS_ADVANCED(PTHREAD_LIBRARIES PTHREAD_INCLUDE_DIR)
+MARK_AS_ADVANCED(PTHREAD_LIBRARIES PTHREAD_LIBRARY PTHREAD_INCLUDE_DIR)
 
diff --git a/INSTALL b/INSTALL
index f483248..52d72f2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -110,7 +110,7 @@ some features of the library. The test coverage for this library is currently
 quite poor. Remember that since the tests use connections to remote batch
 systems, the first causes of failure are network and authentication errors. To
 run the tests, you will first have to enable them by setting CMake variable
-LIBBATCH_TESTS to ON. Then copy the file src/Core/Test/batchtest.conf to your
+LIBBATCH_BUILD_TESTS to ON. Then copy the file src/Core/Test/batchtest.conf to your
 home directory for instance. Edit this file according to your local
 configuration. Set the environment variable BATCH_TEST_CONFIG_FILE to the path
 to your own configuration file. To execute the autotests, just go to your build
diff --git a/src/Core/CMakeLists.txt b/src/Core/CMakeLists.txt
index 036b40a..1bbbfbf 100644
--- a/src/Core/CMakeLists.txt
+++ b/src/Core/CMakeLists.txt
@@ -68,6 +68,6 @@ IF (HAS_SSH)
 ENDIF (HAS_SSH)
 
 
-IF (LIBBATCH_TESTS)
+IF (LIBBATCH_BUILD_TESTS)
     ADD_SUBDIRECTORY(Test)
 ENDIF ()
diff --git a/src/Python/CMakeLists.txt b/src/Python/CMakeLists.txt
index 9ac0b1b..a56f5fb 100644
--- a/src/Python/CMakeLists.txt
+++ b/src/Python/CMakeLists.txt
@@ -55,6 +55,6 @@ INSTALL(TARGETS ${SWIG_MODULE_libbatch_REAL_NAME} DESTINATION ${LIBBATCH_PYTHONP
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libbatch.py
         DESTINATION ${LIBBATCH_PYTHONPATH})
 
-IF (LIBBATCH_TESTS)
+IF (LIBBATCH_BUILD_TESTS)
   ADD_SUBDIRECTORY(Test)
 ENDIF ()
-- 
2.30.2