CMake: Renamed LIBBATCH_TESTS to LIBBATCH_BUILD_TESTS

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a0c7c6818d6a68352ce472ed5ef45d6576c803b..7359c7351fa5c0b583beb87500722a05ec47d746 100644 (file)
--- 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 f5d3bad9230b36234fd26ae82037fa0bc0b18981..020ed06378406eacc062b1d912a11eafe021dd41 100644 (file)
--- 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 f48324879416dcac50f1d7ee4b1fda2f92fbc319..52d72f202a56d20ec69c1a137ec3b4151c0fb3a5 100644 (file)
--- 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 036b40a8cf2befa4e4928afa3a63f1ba8eda185e..1bbbfbff829910e6062751f92ec3bb0067c3fe8f 100644 (file)
--- 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 9ac0b1baf7aaba4c3c48651fee8087b6bb59a6eb..a56f5fb088a275490e6ebcdcbd145a7a649b0da1 100644 (file)
--- 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 ()