From: Nabil Ghodbane Date: Thu, 1 Oct 2020 12:03:19 +0000 (+0200) Subject: fix harmless bug -DCMAKE_C_COMPILER:STRING . '-D' was forgotten X-Git-Tag: V9_6_0~30 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=33cdbca43fb72a8ad6ff19b65a56ae9c0bade3f1;p=tools%2Fsat_salome.git fix harmless bug -DCMAKE_C_COMPILER:STRING . '-D' was forgotten --- diff --git a/products/FIELDS.pyconf b/products/FIELDS.pyconf index 23cd0af..5a7fafc 100755 --- a/products/FIELDS.pyconf +++ b/products/FIELDS.pyconf @@ -34,7 +34,7 @@ default_MPI : { name : "FIELDS" build_source : "cmake" - cmake_options : "-DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc" + cmake_options : "-DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc" get_source : "git" git_info: { diff --git a/products/HEXABLOCK.pyconf b/products/HEXABLOCK.pyconf index 7287c29..4583da0 100644 --- a/products/HEXABLOCK.pyconf +++ b/products/HEXABLOCK.pyconf @@ -48,7 +48,7 @@ default_MPI : { name : "HEXABLOCK" build_source : "cmake" - cmake_options : "-DSALOME_USE_MPI=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc" + cmake_options : "-DSALOME_USE_MPI=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc" get_source : "git" git_info: { diff --git a/products/JOBMANAGER.pyconf b/products/JOBMANAGER.pyconf index 2aaf802..7a2e8f2 100644 --- a/products/JOBMANAGER.pyconf +++ b/products/JOBMANAGER.pyconf @@ -43,7 +43,7 @@ default_MPI : { name : "JOBMANAGER" build_source : "cmake" - cmake_options : "-DSALOME_USE_MPI=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc" + cmake_options : "-DSALOME_USE_MPI=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc" get_source : "git" git_info: { diff --git a/products/KERNEL.pyconf b/products/KERNEL.pyconf index 25daa5d..7f23197 100644 --- a/products/KERNEL.pyconf +++ b/products/KERNEL.pyconf @@ -209,7 +209,7 @@ ALAMOS : default_MPI : { - cmake_options : "-DSALOME_USE_MPI=ON -DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc" + cmake_options : "-DSALOME_USE_MPI=ON -DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc" depend : ["Python", "boost", "numpy", diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf index dc75b25..69be477 100644 --- a/products/MEDCOUPLING.pyconf +++ b/products/MEDCOUPLING.pyconf @@ -92,7 +92,7 @@ version_7_8_2_to_8_4_0 : # Default section for MPI version, for SALOME-8.5.0-MPI and later default_MPI : { - cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=ON -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc" + cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=ON -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc" depend : [ "boost", "Python", diff --git a/products/PARAVIS.pyconf b/products/PARAVIS.pyconf index 10bc493..707e960 100644 --- a/products/PARAVIS.pyconf +++ b/products/PARAVIS.pyconf @@ -72,7 +72,7 @@ default_win: default_MPI : { - cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc" + cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc" depend : [ "KERNEL", "GUI", @@ -122,7 +122,7 @@ version_7_8_0_to_9_1_0 : version_9_5_0_MPI : { - cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc" + cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc" patches : ['PARAVIS-MEDReader-CMakeLists.patch'] # backporting bos #20031 depend : [ "KERNEL",