CMake build procedure improvements:

- minor general improvements

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index 414bedc1274d815d0fb9446526524021e02c1f0c..3be32fdeeb027f6bde4a7bc91f88a957af152f2c 100755 (executable)
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -19,9 +19,7 @@
 
 ADD_SUBDIRECTORY(appliskel)
 
-CONFIGURE_FILE(VERSION.in VERSION @ONLY)
-
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION ${SALOME_INSTALL_BINS})
+SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS})
 
 # ===============================================================
 # Files to be installed

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index 58ff53f1d6e78bcb203842ca72d69f7d18bed927..813ec82c6739271c30cd8ba1b6162b22105c039b 100755 (executable)
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -24,7 +24,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-CONFIGURE_FILE(Calcium_Ports.idl.in Calcium_Ports.idl @ONLY)
+SALOME_CONFIGURE_FILE(Calcium_Ports.idl.in Calcium_Ports.idl)
 
 SET(SalomeIDLKernel_IDLSOURCES
   SALOME_Exception.idl

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index df7d256ee2e4cb431b8449d764d61799b6d0c43a..2d514f99bb2425ed11d6896cc2b4954cfc3ef5a8 100755 (executable)
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -24,15 +24,11 @@
 # These files are data, module or lib files
 INSTALL(FILES CatalogModulePersonnel.xml_skel DESTINATION ${SALOME_KERNEL_INSTALL_RES_DATA})
 
-CONFIGURE_FILE(CatalogResources.xml.in CatalogResources.xml @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/CatalogResources.xml DESTINATION ${SALOME_KERNEL_INSTALL_RES_DATA})
+SALOME_CONFIGURE_FILE(CatalogResources.xml.in CatalogResources.xml INSTALL ${SALOME_KERNEL_INSTALL_RES_DATA})
 
 IF(NOT SALOME_LAUNCHER_ONLY)
   INSTALL(FILES channel.cfg SALOMEDS_Resources DESTINATION ${SALOME_KERNEL_INSTALL_RES_DATA})
-
-  CONFIGURE_FILE(KERNELCatalog.xml.in KERNELCatalog.xml @ONLY)
-  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/KERNELCatalog.xml DESTINATION ${SALOME_KERNEL_INSTALL_RES_DATA})
-
+  SALOME_CONFIGURE_FILE(KERNELCatalog.xml.in KERNELCatalog.xml INSTALL ${SALOME_KERNEL_INSTALL_RES_DATA})
 ENDIF()