From 460cc866a655b3af20376a6e2987d1577f766f4e Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Wed, 12 Feb 2025 05:29:33 -0800 Subject: [PATCH] cmake: remove ortools_full.lib generation on windows note: Do not build anymore got the error: ``` LINK : fatal error LNK1189: library limit of 65535 objects exceeded ``` --- cmake/bundle-install.cmake.in | 49 ----------------------------------- cmake/cpp.cmake | 9 ------- 2 files changed, 58 deletions(-) delete mode 100644 cmake/bundle-install.cmake.in diff --git a/cmake/bundle-install.cmake.in b/cmake/bundle-install.cmake.in deleted file mode 100644 index 1b700f08f3..0000000000 --- a/cmake/bundle-install.cmake.in +++ /dev/null @@ -1,49 +0,0 @@ -cmake_minimum_required(VERSION 3.18) -message("Create bundled lib...") - -# Find lib.exe -find_program(lib_tool lib.exe) - -# remove @PROJECT_NAME@_full.lib -execute_process( - COMMAND ${CMAKE_COMMAND} -E rm -f ortools_full.lib - #COMMAND ${CMAKE_COMMAND} -E false - COMMAND_ECHO STDOUT - COMMAND_ERROR_IS_FATAL ANY - WORKING_DIRECTORY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" -) - -set(DEPS absl_*.lib zlib*.lib re2.lib *protobuf*.lib) -if (@BUILD_Cbc@) - set(DEPS ${DEPS} Cbc*.lib) -endif() -if (@BUILD_Cgl@) - set(DEPS ${DEPS} Cgl.lib) -endif() -if (@BUILD_Clp@) - set(DEPS ${DEPS} Clp*.lib) -endif() -if (@BUILD_Osi@) - set(DEPS ${DEPS} Osi*.lib) -endif() -if (@BUILD_CoinUtils@) - set(DEPS ${DEPS} CoinUtils.lib) -endif() - -if (@BUILD_SCIP@) - set(DEPS ${DEPS} libscip.lib) -endif() -if (@BUILD_GLPK@) - set(DEPS ${DEPS} *glpk.lib) -endif() - -# Bundle all .lib into @PROJECT_NAME@_full.lib -execute_process( - COMMAND ${lib_tool} /NOLOGO /OUT:@PROJECT_NAME@_full.lib @PROJECT_NAME@.lib ${DEPS} - #COMMAND ${CMAKE_COMMAND} -E false - COMMAND_ECHO STDOUT - COMMAND_ERROR_IS_FATAL ANY - WORKING_DIRECTORY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" -) - -message("Create bundled lib...DONE") diff --git a/cmake/cpp.cmake b/cmake/cpp.cmake index 08d14ed5f9..523a339286 100644 --- a/cmake/cpp.cmake +++ b/cmake/cpp.cmake @@ -685,15 +685,6 @@ if(USE_SCIP) COMPONENT Devel) endif() -if(MSVC) -# Bundle lib for MSVC -configure_file( -${PROJECT_SOURCE_DIR}/cmake/bundle-install.cmake.in -${PROJECT_BINARY_DIR}/bundle-install.cmake -@ONLY) -install(SCRIPT ${PROJECT_BINARY_DIR}/bundle-install.cmake) -endif() - install(FILES "${PROJECT_SOURCE_DIR}/LICENSE" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT Devel)