X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=a4f498cdf5d37d4a2b008c21c6cc58cb7c2b17f0;hb=1c8eea67281022e4bda8fb7388da634fe3b535a2;hp=72b81660fb84fbda8fca3db924e6c5553ac72437;hpb=2a50a022e7d20b937832aaf070c795b156cfc236;p=modules%2Fyacs.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72b81660f..a4f498cdf 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,7 +76,8 @@ MARK_AS_ADVANCED(SALOME_LIGHT_ONLY SALOME_USE_LIBBATCH SALOME_PACO_PARALLEL SALO
 # Exception: LibBatch is optional but is loaded first, as it can
 # give Python, Pthread and SWIG:
 IF(SALOME_USE_LIBBATCH)
-  FIND_PACKAGE(SalomeLibBatch REQUIRED)
+  FIND_PACKAGE(SalomeLibBatch)
+  SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(LibBatch SALOME_USE_LIBBATCH)
 ENDIF()
 
 FIND_PACKAGE(SalomePython REQUIRED)
@@ -104,14 +105,21 @@ IF(SALOME_PACO_PARALLEL)
 ENDIF()
 IF(SALOME_BUILD_TESTS)
   ENABLE_TESTING()
-  FIND_PACKAGE(SalomeCppUnit REQUIRED)  
+  FIND_PACKAGE(SalomeCppUnit)
+  SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(CppUnit SALOME_BUILD_TESTS)  
 ENDIF()
 IF(SALOME_BUILD_DOC)
-  FIND_PACKAGE(SalomeDoxygen REQUIRED)
-  FIND_PACKAGE(SalomeGraphviz)          # Remains optional even here.
-  FIND_PACKAGE(SalomeSphinx REQUIRED)
+  FIND_PACKAGE(SalomeDoxygen)
+  FIND_PACKAGE(SalomeGraphviz)
+  FIND_PACKAGE(SalomeSphinx)
+  SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(Doxygen SALOME_BUILD_DOC)
+  SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(Graphviz SALOME_BUILD_DOC)
+  SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(Sphinx SALOME_BUILD_DOC)
 ENDIF()
 
+# Detection summary:
+SALOME_PACKAGE_REPORT()
+
 # Directories
 #
 # Directories have to be given after prerequisites (to be able to use
@@ -134,6 +142,10 @@ SET(SALOME_INSTALL_APPLISKEL_PYTHON ${SALOME_INSTALL_BINS}/appliskel CACHE PATH
 SET(SALOME_INSTALL_CMAKE salome_adm/cmake_files CACHE PATH "Install path: SALOME CMake files")
 SET(SALOME_INSTALL_CMAKE_LOCAL adm_local/cmake_files CACHE PATH 
    "Install path: local SALOME CMake files")
+SET(SALOME_INSTALL_AMCONFIG salome_adm/unix CACHE PATH 
+   "Install path: SALOME config files (obsolete, to be removed)")
+SET(SALOME_INSTALL_AMCONFIG_LOCAL adm_local/unix CACHE PATH 
+   "Install path: local SALOME config files (obsolete, to be removed)")
 
 SET(_pydir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
 SET(SALOME_INSTALL_PYTHON ${_pydir}/salome CACHE PATH "Install path: SALOME Python stuff")
@@ -142,6 +154,8 @@ SET(SALOME_INSTALL_PYTHON_SHARED ${SALOME_INSTALL_PYTHON}/shared_modules CACHE P
 
 SET(SALOME_INSTALL_RES share/salome/resources CACHE PATH "Install path: SALOME resources")
 
+SET(SALOME_INSTALL_DOC share/doc/salome CACHE PATH "Install path: SALOME documentation")
+
 # Kernel specific:
 SET(SALOME_KERNEL_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/kernel" CACHE PATH "Install path: SALOME KERNEL specific data")
 SET(SALOME_KERNEL_INSTALL_RES_SCRIPTS "${SALOME_INSTALL_RES}/kernel" CACHE PATH "Install path: SALOME KERNEL specific scripts")
@@ -149,7 +163,8 @@ SET(SALOME_KERNEL_INSTALL_RES_SCRIPTS "${SALOME_INSTALL_RES}/kernel" CACHE PATH
 MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_IDLS SALOME_INSTALL_HEADERS)
 MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_SCRIPTS SALOME_INSTALL_SCRIPT_DATA SALOME_INSTALL_SCRIPT_PYTHON)
 MARK_AS_ADVANCED(SALOME_INSTALL_APPLISKEL_SCRIPTS  SALOME_INSTALL_APPLISKEL_PYTHON SALOME_INSTALL_CMAKE SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES)
-MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED SALOME_KERNEL_INSTALL_RES_DATA SALOME_KERNEL_INSTALL_RES_SCRIPTS)
+MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED SALOME_KERNEL_INSTALL_RES_DATA SALOME_KERNEL_INSTALL_RES_SCRIPTS SALOME_INSTALL_DOC)
+MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFIG SALOME_INSTALL_AMCONFIG_LOCAL)
 
 # Sources 
 # ========
@@ -167,7 +182,7 @@ ENDIF()
 # Header configuration
 # ====================
 SALOME_XVERSION(${PROJECT_NAME})
-SALOME_CONFIGURE_FILE(KERNEL_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/KERNEL_version.h INSTALL ${SALOME_INSTALL_HEADERS})
+SALOME_CONFIGURE_FILE(KERNEL_version.h.in KERNEL_version.h INSTALL ${SALOME_INSTALL_HEADERS})
 
 # Configuration export
 # ====================
@@ -175,16 +190,22 @@ INCLUDE(CMakePackageConfigHelpers)
 
 # List of targets in this project we want to make visible to the rest of the world.
 # They all have to be INSTALL'd with the option "EXPORT ${PROJECT_NAME}TargetGroup"
+
+# Temporary solution for pakage src\DSC on windows
+IF(NOT WINDOWS)
+  SET(DSC_TGS CalciumC SalomeCalcium SalomeDatastream 
+  SalomePalm SalomeDSCSupervBasic SalomeDSCSuperv)
+ENDIF(NOT WINDOWS)
+
 SET(_${PROJECT_NAME}_exposed_targets
-  CalciumC SalomeCalcium DF Launcher  
-  OpUtil Registry ResourcesManager SALOMEBasics SalomeCatalog SalomeCommunication
-  SalomeContainer SalomeDatastream SalomePalm SalomeDSCContainer SalomeDSClient
-  SalomeDSCSupervBasic SalomeDSCSuperv SalomeDSImpl 
-  SalomeDS  SalomeGenericObj SalomeHDFPersist SalomeIDLKernel
-  SalomeLauncher  SalomeLifeCycleCORBA  SALOMELocalTrace 
+  ${DSC_TGS} DF Launcher OpUtil Registry ResourcesManager 
+  SALOMEBasics SalomeCatalog SalomeCommunication SalomeContainer 
+  SalomeDSCContainer SalomeDSClient SalomeDSImpl 
+  SalomeDS SalomeGenericObj SalomeHDFPersist SalomeIDLKernel
+  SalomeLauncher SalomeLifeCycleCORBA SALOMELocalTrace 
   SalomeLoggerServer SalomeNotification SalomeNS
-  SalomeResourcesManager  
-  TOOLSDS  with_loggerTraceCollector SalomeKernelHelpers)
+  SalomeResourcesManager TOOLSDS with_loggerTraceCollector 
+  SalomeKernelHelpers)
   
 # MPI specific targets:
 IF(SALOME_USE_MPI)