Salome HOME
CMake build procedure improvements:
authorvsr <vsr@opencascade.com>
Tue, 20 Aug 2013 12:33:21 +0000 (12:33 +0000)
committervsr <vsr@opencascade.com>
Tue, 20 Aug 2013 12:33:21 +0000 (12:33 +0000)
- minor general improvements

CMakeLists.txt
doc/docutils/CMakeLists.txt
doc/salome/gui/CMakeLists.txt
idl/CMakeLists.txt
salome_adm/CMakeLists.txt
salome_adm/cmake_files/SalomeKERNELConfig.cmake.in
salome_adm/unix/CMakeLists.txt
salome_adm/unix/config_files/CMakeLists.txt

index 72b81660fb84fbda8fca3db924e6c5553ac72437..b3747b9ccbc36818cb2ec3bc5ff8fabf82c2f252 100755 (executable)
@@ -134,6 +134,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 +146,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 +155,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 
 # ========
index ece384e8078c808e394a6a00ba128974b091e4ef..a87ab4f80edbfde0af82b375128a4158a8db7c5f 100755 (executable)
@@ -83,5 +83,5 @@ ADD_CUSTOM_TARGET(html_docs ${CALL_STR} ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT}
 )
 
 INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target html_docs)")
-INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docutils DESTINATION share/doc/salome/tui/KERNEL)
-INSTALL(FILES ${PROJECT_SOURCE_DIR}/doc/salome/tui/images/head.png DESTINATION share/doc/salome/tui/KERNEL) 
+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docutils DESTINATION ${SALOME_INSTALL_DOC}/tui/KERNEL)
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/doc/salome/tui/images/head.png DESTINATION ${SALOME_INSTALL_DOC}/tui/KERNEL) 
index 32ac4efd04870358d3920076980464d52ae6b187..1eaf1fce52c5382352a1e9a24776e58090605296 100755 (executable)
@@ -32,5 +32,5 @@ ADD_CUSTOM_TARGET(usr_docs ${DOXYGEN_EXECUTABLE})
 ADD_DEPENDENCIES(usr_docs html_docs)
 
 INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target usr_docs)")
-INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KERNEL DESTINATION share/doc/salome/gui)
-INSTALL(FILES images/head.png DESTINATION share/doc/salome/gui/KERNEL) 
+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KERNEL DESTINATION ${SALOME_INSTALL_DOC}/gui)
+INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/KERNEL) 
index 3cb948304f9fea370fc05906beb6735caf525412..58ff53f1d6e78bcb203842ca72d69f7d18bed927 100755 (executable)
@@ -158,8 +158,8 @@ IF(SALOME_PACO_PARALLEL)
     ADD_CUSTOM_COMMAND(OUTPUT ${genidl} ${parsrc} ${parhdr} ${genpacosrc} ${genpacohdr}
       COMMAND ${OMNIORB_IDL_COMPILER} -p${PACO_ROOT_DIR}/lib/python -bpaco -Wb${input},${CMAKE_CURRENT_SOURCE_DIR}:${PACO_ROOT_DIR}/idl ${baseidl}
       DEPENDS ${input} ${baseidl})
-    INSTALL(FILES ${input} ${genidl} DESTINATION idl/salome)
-    INSTALL(FILES ${basehdr} ${parhdr} ${genpacohdr} DESTINATION include/salome)
+    INSTALL(FILES ${input} ${genidl} DESTINATION ${SALOME_INSTALL_IDLS})
+    INSTALL(FILES ${basehdr} ${parhdr} ${genpacohdr} DESTINATION ${SALOME_INSTALL_HEADERS})
     IF(OMNIORB_PYTHON_BACKEND)
       SET(IDLPYFLAGS "-bpython -p${OMNIORB_PYTHON_BACKEND} -I${CMAKE_CURRENT_SOURCE_DIR} -I${PACO_ROOT_DIR}/idl")
       INSTALL(CODE "OMNIORB_COMPILE_IDL_FORPYTHON_ON_INSTALL( \"${OMNIORB_IDL_COMPILER}\" \"${IDLPYFLAGS}\" \"${genidl}\" \"${CMAKE_INSTALL_PREFIX}/\${INSTALL_PYIDL_DIR}\" )")
index 0e2733cceae1c41b50da700112e5be308cf43cac..3760caf2aa003b9bbc3650fbda46dc6c0ee8208b 100755 (executable)
@@ -21,4 +21,4 @@ ADD_SUBDIRECTORY(unix)
 ADD_SUBDIRECTORY(cmake_files)
 
 SALOME_CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/SALOMEconfig.ref.in" "${CMAKE_CURRENT_BINARY_DIR}/SALOMEconfig.h" INSTALL ${SALOME_INSTALL_HEADERS})
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SALOMEconfig.ref.in DESTINATION salome_adm/unix RENAME SALOMEconfig.h.in)
\ No newline at end of file
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SALOMEconfig.ref.in DESTINATION ${SALOME_INSTALL_AMCONFIG} RENAME SALOMEconfig.h.in)
\ No newline at end of file
index 53844ac8113ed14f8e176715e8dd00e27019e4d3..7a3dc823cc64a6a4a5253aef87241ff3e3079183 100644 (file)
@@ -121,6 +121,9 @@ SET(SALOME_INSTALL_CMAKE_LOCAL "@SALOME_INSTALL_CMAKE_LOCAL@")
 SET(SALOME_INSTALL_PYTHON "@SALOME_INSTALL_PYTHON@")
 SET(SALOME_INSTALL_PYTHON_SHARED "@SALOME_INSTALL_PYTHON_SHARED@")
 SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@")
+SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@")
+SET(SALOME_INSTALL_AMCONFIG "@SALOME_INSTALL_AMCONFIG@") # to be removed
+SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@") # to be removed
 
 # Exposed targets:
 SET(KERNEL_CalciumC CalciumC)
index 2b9bd368bd175866cd6d243e7440b70cc9573152..a620bd06604662727c82aebca3756606a11df5bc 100755 (executable)
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-\r
-ADD_SUBDIRECTORY(config_files)\r
-\r
-SET(DEPRECATED_FILES\r
-  DEPRECATED/F77config.h.in\r
-  DEPRECATED/sstream.in\r
-  DEPRECATED/envScript.in\r
-  DEPRECATED/depend.in\r
-  DEPRECATED/make_commence.in\r
-  DEPRECATED/make_conclude.in\r
-  DEPRECATED/make_module.in\r
-  DEPRECATED/make_omniorb.in\r
-)\r
-\r
-# The deprecated files are deprecated for the KERNEL but not for the\r
-# related modules (GUI, MED, ...), for now. Some files have to be installed.\r
-INSTALL(FILES ${DEPRECATED_FILES} DESTINATION salome_adm/unix)\r
+
+ADD_SUBDIRECTORY(config_files)
+
+SET(DEPRECATED_FILES
+  DEPRECATED/F77config.h.in
+  DEPRECATED/sstream.in
+  DEPRECATED/envScript.in
+  DEPRECATED/depend.in
+  DEPRECATED/make_commence.in
+  DEPRECATED/make_conclude.in
+  DEPRECATED/make_module.in
+  DEPRECATED/make_omniorb.in
+)
+
+# The deprecated files are deprecated for the KERNEL but not for the
+# related modules (GUI, MED, ...), for now. Some files have to be installed.
+INSTALL(FILES ${DEPRECATED_FILES} DESTINATION ${SALOME_INSTALL_AMCONFIG})
index 9597663c9378ad84705360b674059382ce3f9efb..56ce303695027d6353e41e294501e54b563171ae 100755 (executable)
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
\r
-# The deprecated files are deprecated for the KERNEL but not for the\r
-# related modules (GUI, MED, ...). Some files have to be installed.\r
-SET(DEPRECATED_FILES\r
-  DEPRECATED/ac_cc_warnings.m4\r
-  DEPRECATED/ac_cxx_bool.m4\r
-  DEPRECATED/ac_cxx_mutable.m4\r
-  DEPRECATED/ac_cxx_partial_specialization.m4\r
-  DEPRECATED/ac_cxx_typename.m4\r
-  DEPRECATED/check_mico.m4\r
-  DEPRECATED/check_pthreads.m4\r
-  DEPRECATED/config.sub\r
-  DEPRECATED/config.guess\r
-  DEPRECATED/install-sh\r
-  DEPRECATED/libtool.m4\r
-  DEPRECATED/ltconfig\r
-  DEPRECATED/ltmain.sh\r
-  DEPRECATED/check_Salome.m4\r
-  DEPRECATED/check_java.m4\r
-  DEPRECATED/missing\r
-  DEPRECATED/mkinstalldirs\r
-)\r
-\r
-SET(m4_DATA\r
-  ac_cxx_depend_flag.m4\r
-  ac_cxx_have_sstream.m4\r
-  ac_cxx_namespaces.m4\r
-  ac_cxx_option.m4\r
-  ac_cxx_template_options.m4\r
-  ac_cxx_use_std_iostream.m4\r
-  ac_cxx_warnings.m4\r
-  ac_linker_options.m4\r
-  ac_check_sizeof_fortran.m4\r
-  acx_pthread.m4\r
-  check_Kernel.m4\r
-  check_boost.m4\r
-  check_cas.m4\r
-  check_corba.m4\r
-  check_cppunit.m4\r
-  check_f77.m4\r
-  check_calcium.m4\r
-  check_hdf5.m4\r
-  check_htmlgen.m4\r
-  check_sphinx.m4\r
-  check_lam.m4\r
-  check_libbatch.m4\r
-  check_mpi.m4\r
-  check_openmpi.m4\r
-  check_mpich.m4\r
-  check_omniorb.m4\r
-  check_sockets.m4\r
-  check_swig.m4\r
-  check_vtk.m4\r
-  check_withihm.m4\r
-  enable_pthreads.m4\r
-  production.m4\r
-  pyembed.m4\r
-  python.m4\r
-  check_libxml.m4\r
-  check_paco++.m4\r
-  local_install.m4\r
-  hack_libtool.m4\r
-  check_tbb.m4\r
-  check_med3.m4\r
-)\r
-INSTALL(FILES ${DEPRECATED_FILES} DESTINATION salome_adm/unix/config_files/DEPRECATED)\r
-INSTALL(FILES ${m4_DATA} DESTINATION salome_adm/unix/config_files)\r
+# The deprecated files are deprecated for the KERNEL but not for the
+# related modules (GUI, MED, ...). Some files have to be installed.
+SET(DEPRECATED_FILES
+  DEPRECATED/ac_cc_warnings.m4
+  DEPRECATED/ac_cxx_bool.m4
+  DEPRECATED/ac_cxx_mutable.m4
+  DEPRECATED/ac_cxx_partial_specialization.m4
+  DEPRECATED/ac_cxx_typename.m4
+  DEPRECATED/check_mico.m4
+  DEPRECATED/check_pthreads.m4
+  DEPRECATED/config.sub
+  DEPRECATED/config.guess
+  DEPRECATED/install-sh
+  DEPRECATED/libtool.m4
+  DEPRECATED/ltconfig
+  DEPRECATED/ltmain.sh
+  DEPRECATED/check_Salome.m4
+  DEPRECATED/check_java.m4
+  DEPRECATED/missing
+  DEPRECATED/mkinstalldirs
+)
+
+SET(m4_DATA
+  ac_cxx_depend_flag.m4
+  ac_cxx_have_sstream.m4
+  ac_cxx_namespaces.m4
+  ac_cxx_option.m4
+  ac_cxx_template_options.m4
+  ac_cxx_use_std_iostream.m4
+  ac_cxx_warnings.m4
+  ac_linker_options.m4
+  ac_check_sizeof_fortran.m4
+  acx_pthread.m4
+  check_Kernel.m4
+  check_boost.m4
+  check_cas.m4
+  check_corba.m4
+  check_cppunit.m4
+  check_f77.m4
+  check_calcium.m4
+  check_hdf5.m4
+  check_htmlgen.m4
+  check_sphinx.m4
+  check_lam.m4
+  check_libbatch.m4
+  check_mpi.m4
+  check_openmpi.m4
+  check_mpich.m4
+  check_omniorb.m4
+  check_sockets.m4
+  check_swig.m4
+  check_vtk.m4
+  check_withihm.m4
+  enable_pthreads.m4
+  production.m4
+  pyembed.m4
+  python.m4
+  check_libxml.m4
+  check_paco++.m4
+  local_install.m4
+  hack_libtool.m4
+  check_tbb.m4
+  check_med3.m4
+)
+INSTALL(FILES ${DEPRECATED_FILES} DESTINATION ${SALOME_INSTALL_AMCONFIG}/config_files/DEPRECATED)
+INSTALL(FILES ${m4_DATA} DESTINATION ${SALOME_INSTALL_AMCONFIG}/config_files)