Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 1d8a89b

Browse files
committedMar 17, 2025
Switch flint build to autotools in cmake build
Their cmake build is deprecated outside Windows.
1 parent 8cea255 commit 1d8a89b

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed
 

‎M2/cmake/build-libraries.cmake

+17-16
Original file line numberDiff line numberDiff line change
@@ -343,25 +343,26 @@ _ADD_COMPONENT_DEPENDENCY(libraries ntl gmp NTL_FOUND)
343343
ExternalProject_Add(build-flint
344344
PREFIX libraries/flint
345345
SOURCE_DIR ${CMAKE_SOURCE_DIR}/submodules/flint
346-
BINARY_DIR libraries/flint/build
347-
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${M2_HOST_PREFIX}
348-
-DCMAKE_SYSTEM_PREFIX_PATH=${M2_HOST_PREFIX}
349-
-DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake
350-
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
351-
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
352-
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
353-
-DCMAKE_C_FLAGS=${CFLAGS}
354-
-DCMAKE_CXX_FLAGS=${CXXFLAGS}
355-
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
356-
-DIPO_SUPPORTED=OFF # TODO: because of clang; see https://github.com/wbhart/flint2/issues/644
357-
-DWITH_NTL=ON
358-
INSTALL_COMMAND ${CMAKE_COMMAND} --install . ${strip_setting}
346+
BUILD_IN_SOURCE ON
347+
CONFIGURE_COMMAND ./bootstrap.sh &&
348+
${CONFIGURE} --prefix=${M2_HOST_PREFIX}
349+
${shared_setting}
350+
"CPPFLAGS=${CPPFLAGS} -I${GMP_INCLUDE_DIRS}"
351+
CFLAGS=${CFLAGS}
352+
CXXFLAGS=${CXXFLAGS}
353+
LDFLAGS=${LDFLAGS}
354+
CC=${CMAKE_C_COMPILER}
355+
CXX=${CMAKE_CXX_COMPILER}
356+
AR=${CMAKE_AR}
357+
OBJDUMP=${CMAKE_OBJDUMP}
358+
STRIP=${CMAKE_STRIP}
359+
RANLIB=${CMAKE_RANLIB}
360+
BUILD_COMMAND ${MAKE} -j${PARALLEL_JOBS}
361+
INSTALL_COMMAND ${MAKE} -j${PARALLEL_JOBS} install
359362
COMMAND ${CMAKE_COMMAND} -E make_directory ${M2_INSTALL_LICENSESDIR}/flint
360363
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/submodules/flint/README.md ${M2_INSTALL_LICENSESDIR}/flint
361364
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/submodules/flint/COPYING ${M2_INSTALL_LICENSESDIR}/flint
362-
TEST_COMMAND ${CMAKE_COMMAND} . -DBUILD_TESTING=ON
363-
COMMAND ${CMAKE_COMMAND} --build .
364-
COMMAND ${CMAKE_COMMAND} --build . --target test
365+
TEST_COMMAND ${MAKE} -j${PARALLEL_JOBS} check
365366
EXCLUDE_FROM_ALL ON
366367
TEST_EXCLUDE_FROM_MAIN ON
367368
STEP_TARGETS install test

0 commit comments

Comments
 (0)
Please sign in to comment.