Commit 97b8f889 authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Fixes for packaging.

parent f4d8c7df
Pipeline #2534 canceled with stages
in 1 minute and 41 seconds
......@@ -161,6 +161,7 @@
- ./SRPMS/*.rpm
- ${version_file}
expire_in: 1 week
timeout: 8h
##
## Test the generated RPM packages: first, run the ADRSolver on a
......
......@@ -319,12 +319,14 @@ IF (NEKTAR_BUILD_TESTS)
ENDIF (NEKTAR_BUILD_TESTS)
# Compile list of definitions for Nektar++Config.cmake input file. We exclude
# vtk definitions which should not be required for external builds.
# vtk definitions which should not be required for external builds. We also need
# to eliminate generator expressions from OCE which were not evaluated during
# OCE build (bug).
SET(NEKTAR_DEFINITIONS "")
GET_DIRECTORY_PROPERTY(
NEKTAR_DEFINITIONS_LIST DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS)
FOREACH(def ${NEKTAR_DEFINITIONS_LIST})
IF (NOT def MATCHES "^vtk")
IF (NOT def MATCHES "^vtk" AND NOT def MATCHES "CONFIG:RelWithDebInfo")
SET(NEKTAR_DEFINITIONS "${NEKTAR_DEFINITIONS} -D${def}")
ENDIF()
ENDFOREACH()
......
......@@ -230,8 +230,13 @@ int main(int argc, char *argv[])
fs::copy(source, dest);
#if BOOST_VERSION < 107400
// If source is a directory, then only directory name is
// created, so call copy again to copy files.
// In Boost 1.74, the default behaviour of fs::copy is to
// recursively copy files. copy_directory has been deprecated in
// light of new create_directory, so we use the BOOST_VERSION macro
// here.
if (fs::is_directory(source))
{
for (const auto& dirEnt :
......@@ -241,6 +246,7 @@ int main(int argc, char *argv[])
fs::copy(dirEnt.path(), newdest);
}
}
#endif
}
// If we're Python, copy script too.
......
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