Commit a8fc1bc0 authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Disable fortran and warnings for cwipi, reenable on OSX.

parent a5e4fb83
Pipeline #2439 failed with stages
in 88 minutes and 43 seconds
......@@ -20,12 +20,10 @@ elif [[ $BUILD_TYPE == "full" ]] || [[ $BUILD_TYPE == "full_py3" ]]; then
-DNEKTAR_USE_HDF5:BOOL=ON \
-DNEKTAR_USE_MESHGEN:BOOL=ON \
-DNEKTAR_USE_CCM:BOOL=ON \
-DNEKTAR_USE_CWIPI:BOOL=ON \
-DNEKTAR_BUILD_PYTHON:BOOL=ON \
-DNEKTAR_TEST_USE_HOSTFILE=ON \
-DNEKTAR_ERROR_ON_WARNINGS=OFF"
if [[ $OS_VERSION != "osx" ]]; then
BUILD_OPTS="$BUILD_OPTS -DNEKTAR_USE_CWIPI:BOOL=ON"
fi
if [[ $BUILD_TYPE == "full_py3" ]]; then
BUILD_OPTS="$BUILD_OPTS -DNEKTAR_USE_PYTHON3:BOOL=ON"
fi
......
......@@ -51,9 +51,11 @@ IF ( NEKTAR_USE_CWIPI )
BINARY_DIR ${TPBUILD}/cwipi-0.11.1
TMP_DIR ${TPBUILD}/cwipi-0.11.1-tmp
INSTALL_DIR ${TPDIST}
PATCH_COMMAND patch -p1 < ${PROJECT_SOURCE_DIR}/cmake/thirdparty-patches/cwipi-disable-warnings.patch
COMMAND patch -p1 < ${PROJECT_SOURCE_DIR}/cmake/thirdparty-patches/cwipi-disable-fortran.patch
CONFIGURE_COMMAND
CFLAGS=-std=c99
CXXFLAGS=-std=c++11
CFLAGS=-w
CXXFLAGS=-w
CC=${MPI_C_COMPILER}
CXX=${MPI_CXX_COMPILER}
FC=${MPI_Fortran_COMPILER}
......
diff -Naur cwipi-0.11.1.old/cmake/modules/default_flags.cmake cwipi-0.11.1/cmake/modules/default_flags.cmake
--- cwipi-0.11.1.old/cmake/modules/default_flags.cmake 2020-11-07 20:58:47.029647862 +0000
+++ cwipi-0.11.1/cmake/modules/default_flags.cmake 2020-11-07 21:14:58.446070804 +0000
@@ -108,8 +108,6 @@
else ()
- message (WARNING "Default flags are not defined for ${CMAKE_Fortran_COMPILER_ID}")
-
set (CMAKE_Fortran_FLAGS "")
set (CMAKE_Fortran_FLAGS_RELEASE "-O")
set (CMAKE_Fortran_FLAGS_DEBUG "-g")
diff -Naur cwipi-0.11.1.old/CMakeLists.txt cwipi-0.11.1/CMakeLists.txt
--- cwipi-0.11.1.old/CMakeLists.txt 2020-03-27 10:29:35.000000000 +0000
+++ cwipi-0.11.1/CMakeLists.txt 2020-11-07 21:03:10.110847267 +0000
@@ -19,7 +19,7 @@
set(CWP_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
set(CMAKE_MODULE_PATH "${CWP_CMAKE_DIR}/modules")
-project(CWP VERSION 0.11.1 LANGUAGES C CXX Fortran)
+project(CWP VERSION 0.11.1 LANGUAGES C CXX)
#------------------------------------------------------------------------------
# Enable languages
diff -Naur cwipi-0.11.1.old/cmake/modules/default_flags.cmake cwipi-0.11.1/cmake/modules/default_flags.cmake
--- cwipi-0.11.1.old/cmake/modules/default_flags.cmake 2020-03-27 10:29:35.000000000 +0000
+++ cwipi-0.11.1/cmake/modules/default_flags.cmake 2020-11-07 20:53:28.256197580 +0000
@@ -16,7 +16,7 @@
link_libraries("m")
- set (CMAKE_Fortran_FLAGS "-fPIC -Wall -pedantic -std=gnu -Wno-unused-dummy-argument -Wno-maybe-uninitialized")
+ set (CMAKE_Fortran_FLAGS "-w -fPIC")
set (CMAKE_Fortran_FLAGS_RELEASE "-O3")
set (CMAKE_Fortran_FLAGS_DEBUG "-O0 -g -fcheck=bounds -fbacktrace")
@@ -29,7 +29,7 @@
elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
- set (CMAKE_Fortran_FLAGS "-cpp -fpic -warn -diag-disable 7712")
+ set (CMAKE_Fortran_FLAGS "-w -cpp -fpic -warn -diag-disable 7712")
set (CMAKE_Fortran_FLAGS_RELEASE "-O3")
@@ -143,7 +143,7 @@
link_libraries ("m")
- set (CMAKE_C_FLAGS "-std=gnu99 -fPIC -funsigned-char -pedantic -W -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wunused -Wfloat-equal -Wno-unused-dummy-argument")
+ set (CMAKE_C_FLAGS "-w -std=gnu99 -fPIC -funsigned-char -pedantic")
set (CMAKE_C_FLAGS_RELEASE "-O3")
set (CMAKE_C_FLAGS_DEBUG "-O0 -g")
@@ -240,7 +240,7 @@
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
link_libraries ("m")
- set (CMAKE_CXX_FLAGS "-std=c++11 -fPIC -funsigned-char -W -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wunused -Wno-long-long -Wfloat-equal -Wno-unused-dummy-argument")
+ set (CMAKE_CXX_FLAGS "-w -std=c++11 -fPIC -funsigned-char")
set (CMAKE_CXX_FLAGS_RELEASE "-O3")
set (CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment