X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=bcb22e8b6481e00ef2e75dc0f435e4df36ef291b;hb=49244ac6010c5a283ff13013a0b540e2a575c1db;hp=af69cb3a09b868530659d52028b8b9bac4f2c409;hpb=424b035fe0606b75e2cc3360b8b1bb127f9684d1;p=modules%2Fjobmanager.git diff --git a/CMakeLists.txt b/CMakeLists.txt index af69cb3..bcb22e8 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ CMAKE_POLICY(SET CMP0003 NEW) STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 2) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 3) SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) SET(${PROJECT_NAME_UC}_VERSION ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) @@ -58,11 +58,14 @@ SET(BUILD_SHARED_LIBS TRUE) LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files") # User options -# (some options have already been defined in KERNEL) # ============ -#OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) #for use in the future +OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) OPTION(SALOME_BUILD_DOC "Generate SALOME JOBMANAGER documentation" ON) +IF(SALOME_BUILD_TESTS) + ENABLE_TESTING() +ENDIF() + ## ## From KERNEL: ## @@ -180,6 +183,10 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets} SET(GUI_ROOT_DIR "${GUI_ROOT_DIR}") SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include") + +# Build variables that will be expanded when configuring SalomeConfig.cmake: +# SALOME_CONFIGURE_PREPARE() #For use in the future + CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}"