Merge remote-tracking branch 'origin/v9-minor'

CMakeLists.txt

@@ -124,7 +124,6 @@ set(CMAKE_CXX_STANDARD 14)
 #search the selected symmetry computation program
 message(STATUS "Finding symmetry computation program \"${SYM}\"")
 
-unset(NAUTY_TARGET)
 if(SYM STREQUAL "bliss" OR SYM STREQUAL "sbliss")
     if(SYM STREQUAL "bliss")
         message(STATUS "Support SYM: bliss")
@@ -177,16 +176,15 @@ elseif(SYM STREQUAL "nauty" OR SYM STREQUAL "snauty")
         set(SYM_LIBRARIES ${NAUTY_DIR}/nauty/nauty.a)
         set(SYM_PIC_LIBRARIES ${NAUTY_DIR}/nauty/nauty.a)
     else()
-        add_subdirectory(src/nauty)
-        set(SYM_PIC_LIBRARIES nauty)
-        set(NAUTY_TARGET nauty)
+        include_directories(src/nauty)
+        set(sym nauty/nauty.c nauty/nautil.c nauty/nausparse.c nauty/schreier.c nauty/naurng.c)
     endif()
     if(SYM STREQUAL "nauty")
         message(STATUS "Support SYM: nauty")
-        set(sym symmetry/compute_symmetry_nauty.c)
+        set(sym ${sym} symmetry/compute_symmetry_nauty.c)
     elseif(SYM STREQUAL "snauty")
         message(STATUS "Support SYM: sassy+nauty")
-        set(sym symmetry/compute_symmetry_sassy_nauty.cpp symmetry/build_sassy_graph.cpp)
+        set(sym ${sym} symmetry/compute_symmetry_sassy_nauty.cpp symmetry/build_sassy_graph.cpp)
         # sassy needs C++-17
         set(CMAKE_CXX_STANDARD 17)
     endif()

src/CMakeLists.txt

@@ -1068,24 +1068,12 @@ if(SHARED)
     set(ZIMPL_NEEDED 0)
     target_link_libraries(libscip PRIVATE ${ZIMPL_PIC_LIBRARIES} ${LPS_PIC_LIBRARIES} ${SYM_PIC_LIBRARIES})
     add_executable(scip main.c ${scipsources} ${objscipsources} ${lpisources} ${tpisources} ${symsources})
-    if(DEFINED NAUTY_TARGET)
-      target_link_libraries(scip PRIVATE ${NAUTY_TARGET})
-    endif()
 else()
     set(SOPLEX_NEEDED ${SOPLEX_FOUND})
     set(ZIMPL_NEEDED ${ZIMPL_FOUND})
-    if(DEFINED NAUTY_TARGET)
-        target_link_libraries(libscip PRIVATE ${ZIMPL_LIBRARIES} ${LPS_LIBRARIES})
-    else()
-        target_link_libraries(libscip PRIVATE ${ZIMPL_LIBRARIES} ${LPS_LIBRARIES} ${SYM_LIBRARIES})
-    endif()
+    target_link_libraries(libscip PRIVATE ${ZIMPL_LIBRARIES} ${LPS_LIBRARIES} ${SYM_LIBRARIES})
     add_executable(scip main.c)
-    if(DEFINED NAUTY_TARGET)
-        target_link_libraries(scip PUBLIC libscip)
-        target_link_libraries(scip PRIVATE ${NAUTY_TARGET})
-    else()
-        target_link_libraries(scip PUBLIC libscip)
-    endif()
+    target_link_libraries(scip PUBLIC libscip)
 endif()
 
 add_executable(SCIP::SCIP ALIAS scip)
@@ -1161,7 +1149,7 @@ install(TARGETS scip libscip EXPORT scip-targets
         INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 # Add all targets to the build-tree export set
-export(TARGETS scip libscip ${NAUTY_TARGET}
+export(TARGETS scip libscip
   FILE "${PROJECT_BINARY_DIR}/scip-targets.cmake")
 
 # make soplex and zimpl dir absolute for the config file

src/nauty/naurng.c

@@ -87,7 +87,7 @@ ran_init_time(unsigned long long extra)
 }
 
 unsigned long long
-ran_nextran()
+ran_nextran(void)  /*SV added void*/
 /* Make a 64-bit random number */
 {
     return KISS;