Merge branch 'vsr/cos55_gcc44' into SALOME_7

[tools/install.git] / config_files / cgnslib.sh

diff --git a/config_files/cgnslib.sh b/config_files/cgnslib.sh
index b475dcf9282b7da251c12cddd6b1dd94228939af..657b2c2c6b0cd5376172b8449cc49044dcbd32f9 100755 (executable)
--- a/config_files/cgnslib.sh
+++ b/config_files/cgnslib.sh
@@ -81,12 +81,11 @@ mkdir ${PRODUCT_BUILD_DIR}
 cd ${PRODUCT_BUILD_DIR}
     
 CMAKE_OPTIONS=""
-
-### common settings
+# - common settings
 CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_DIR}"
 CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DCMAKE_BUILD_TYPE:STRING=Release"
 CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DBUILD_SHARED_LIBS:BOOL=ON"
-### HDF5 settings
+# - HDF5 settings
 if [ "${HDF5_ROOT_DIR}" != "" ]; then
     CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DENABLE_HDF5:BOOL=ON"
     CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DHDF5_INCLUDE_PATH:PATH=${HDF5_ROOT_DIR}/include"
@@ -108,17 +107,13 @@ if [ "${HDF5_ROOT_DIR}" != "" ]; then
 fi
 
 cat > ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
-cmake  : `which cmake`
-
-used settings:
-${CMAKE_OPTIONS}
+-------------------
+Used options: ${CMAKE_OPTIONS}
+-------------------
 EOF
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG cmake ${PRODUCT_SRC_DIR} ${CMAKE_OPTIONS}
-cat > ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=`which gcc`
-EOF
-check_job ${PRODUCT_DIR}/MAKE.LOG make -j4
-check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
+check_job ${PRODUCT_DIR}/MAKE.LOG make VERBOSE=1 -j4
+check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make VERBOSE=1 install
 
 cd ${PRODUCT_DIR}