We can easily build FLINT 3.2.1

Author: msoos

CMakeLists.txt

@@ -335,11 +335,7 @@ set(FPHSA_NAME_MISMATCHED 1) # Suppress warnings, see https://cmake.org/cmake/he
 find_package(GMP REQUIRED)
 find_package(MPFR REQUIRED)
 
-option(POLYS "Allow polynomials" ON)
-if (POLYS)
-  find_package(FLINT REQUIRED)
-  add_definitions( -DPOLYS )
-endif()
+find_package(FLINT REQUIRED)
 MESSAGE(STATUS "MPFR include dir: ${MPFR_INCLUDE_DIR}")
 MESSAGE(STATUS "MPFR lib dir: ${MPFR_LIBRARIES}")
 

scripts/build_emscripten.sh

@@ -2,7 +2,7 @@
 set -e
 
 rm -rf lib* Test* tests* include tests CM* cmake* arjun Makefile rjun-src
-emcmake cmake -DCMAKE_INSTALL_PREFIX=$EMINSTALL -DENABLE_TESTING=OFF -DPOLYS=OFF ..
+emcmake cmake -DCMAKE_INSTALL_PREFIX=$EMINSTALL -DENABLE_TESTING=OFF ..
 emmake make -j26
 emmake make install
 cp ganak.wasm ../html

src/CMakeLists.txt

@@ -29,9 +29,7 @@ include_directories(${MPFR_INCLUDE_DIR})
 include_directories( ${GMP_INCLUDE_DIR} )
 include_directories( ${BREAKID_INCLUDE_DIRS} )
 include_directories( ${APPROXMC_INCLUDE_DIRS} )
-if (POLYS)
-  include_directories( ${FLINT_INCLUDE_DIRS} )
-endif()
+include_directories( ${FLINT_INCLUDE_DIRS} )
 
 if (NOT WIN32)
     #add_cxx_flag_if_supported("-Wno-bitfield-constant-conversion")
@@ -78,35 +76,26 @@ SET(SOURCES
     buddy-2.4/src/tree.c
     buddy-2.4/src/cppext.cxx
     ganak.cpp
-	${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp
 )
 
-set (GLIBS
+ADD_LIBRARY(ganak ${SOURCES} ${LIB})
+target_link_libraries (ganak
   LINK_PUBLIC ${CRYPTOMINISAT5_LIBRARIES}
   LINK_PUBLIC ${ARJUN_LIBRARIES}
   LINK_PUBLIC ${APPROXMC_LIBRARIES}
   LINK_PUBLIC ${BREAKID_LIBRARIES}
-)
-
-if (POLYS)
-  set (GLIBS ${GLIBS}
-  LINK_PUBLIC ${FLINT_LIBRARIES})
-endif()
-
-set (GLIBS ${GLIBS}
+  LINK_PUBLIC ${FLINT_LIBRARIES}
   LINK_PUBLIC ${MPFR_LIBRARIES}
   LINK_PUBLIC ${GMP_LIBRARIES}
 )
 
-ADD_LIBRARY(ganak ${SOURCES} ${LIB})
-target_link_libraries (ganak ${GLIBS})
-
 set_target_properties(ganak PROPERTIES
-    PUBLIC_HEADER "${ganak_public_headers}"
-    VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
-    SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
-    RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
-    INSTALL_RPATH_USE_LINK_PATH TRUE
+  PUBLIC_HEADER "${ganak_public_headers}"
+  VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+  SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+  RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
+  INSTALL_RPATH_USE_LINK_PATH TRUE
 )
 
 add_executable (ganak-bin main.cpp)

src/main.cpp

@@ -42,9 +42,7 @@ THE SOFTWARE.
 #include <breakid/breakid.hpp>
 #include <arjun/arjun.h>
 #include "src/argparse.hpp"
-#ifdef POLYS
 #include "mpoly.hpp"
-#endif
 #include "mparity.hpp"
 #include "mcomplex.hpp"
 #include "mcomplex-mpfr.hpp"
@@ -530,16 +528,11 @@ int main(int argc, char *argv[])
         fg = std::make_unique<FGenMPFComplex>();
         break;
     case 3:
-#ifdef POLYS
         if (poly_nvars == -1) {
           cout << "c o [arjun] ERROR: Must provide number of polynomial vars for mode 3 via --npolyvars" << endl;
           exit(-1);
         }
         fg = std::make_unique<FGenPoly>(poly_nvars);
-#else
-        cout << "c o [arjun] ERROR: Polynomials not supported in this build" << endl;
-        exit(-1);
-#endif
         break;
     case 4:
         fg = std::make_unique<FGenParity>();