diff --git a/.ci_support/run_docker_linux.sh b/.ci_support/run_docker_linux.sh index c92c18d..13f4925 100755 --- a/.ci_support/run_docker_linux.sh +++ b/.ci_support/run_docker_linux.sh @@ -6,8 +6,8 @@ cd /tmp mkdir build && cd build cmake -DCMAKE_INSTALL_PREFIX=~/.local \ -DCMAKE_UNITY_BUILD=ON -DCMAKE_UNITY_BUILD_BATCH_SIZE=32 \ - -DCMAKE_CXX_FLAGS="-Wall -Wextra -Werror -D_GLIBCXX_ASSERTIONS" \ - -DSWIG_COMPILE_FLAGS="-O1 -Wno-unused-parameter" \ + -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Wshadow -Werror -D_GLIBCXX_ASSERTIONS" \ + -DSWIG_COMPILE_FLAGS="-O1 -Wno-unused-parameter -Wno-shadow" \ -DSPHINX_FLAGS="-W -T -j4" \ /io make install @@ -19,6 +19,6 @@ uid=$1 gid=$2 if test -n "${uid}" -a -n "${gid}" then - sudo cp -r ~/.local/share/*/doc/html /io + sudo cp -r ~/.local/share/doc/*/html /io sudo chown -R ${uid}:${gid} /io/html fi diff --git a/.ci_support/run_docker_mingw.sh b/.ci_support/run_docker_mingw.sh index 7a700b2..f743f76 100755 --- a/.ci_support/run_docker_mingw.sh +++ b/.ci_support/run_docker_mingw.sh @@ -17,6 +17,6 @@ CXXFLAGS="-Wall -Wextra -D_GLIBCXX_ASSERTIONS" ${ARCH}-w64-mingw32-cmake \ make install ${ARCH}-w64-mingw32-strip --strip-unneeded ${PREFIX}/bin/*.dll ${PREFIX}/Lib/site-packages/*/*.pyd echo lib/test ${PREFIX}/Lib/site-packages/* | xargs -n 1 cp ${PREFIX}/bin/*.dll -ctest -R pyinstallcheck --output-on-failure --timeout 1000 --schedule-random ${MAKEFLAGS} +OPENTURNS_NUM_THREADS=2 ctest -R pyinstallcheck --output-on-failure --timeout 1000 --schedule-random ${MAKEFLAGS} make tests -ctest -R cppcheck --output-on-failure --timeout 1000 --schedule-random ${MAKEFLAGS} +OPENTURNS_NUM_THREADS=2 ctest -R cppcheck --output-on-failure --timeout 1000 --schedule-random ${MAKEFLAGS} diff --git a/CMakeLists.txt b/CMakeLists.txt index af2dcce..7237854 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,12 +49,14 @@ if (NOT DEFINED CMAKE_INSTALL_LIBDIR) set (CMAKE_INSTALL_LIBDIR lib${LIB_SUFFIX}) endif () +include (GNUInstallDirs) + set (OTFFTW_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR}) -set (OTFFTW_INCLUDE_PATH include) +set (OTFFTW_INCLUDE_PATH ${CMAKE_INSTALL_INCLUDEDIR}) set (OTFFTW_SWIG_INCLUDE_DIRS ${OTFFTW_INCLUDE_PATH}/${PACKAGE_NAME}/swig) -set (OTFFTW_DATA_PATH share) +set (OTFFTW_DATA_PATH ${CMAKE_INSTALL_DATAROOTDIR}) set (OTFFTW_CONFIG_CMAKE_PATH ${CMAKE_INSTALL_LIBDIR}/cmake/otfftw) -set (OTFFTW_DOC_PATH share/${PACKAGE_NAME}/doc) +set (OTFFTW_DOC_PATH ${CMAKE_INSTALL_DOCDIR}) set (CMAKE_CXX_STANDARD 11) diff --git a/python/src/FFTW.i b/python/src/FFTW.i index cb5c5e4..210e6f4 100644 --- a/python/src/FFTW.i +++ b/python/src/FFTW.i @@ -4,5 +4,6 @@ #include "otfftw/FFTW.hxx" %} +%copyctor OTFFTW::FFTW; + %include otfftw/FFTW.hxx -namespace OTFFTW { %extend FFTW { FFTW(const FFTW & other) { return new OTFFTW::FFTW(other); } } }