cmake: Fix shared lib support with MSVC

Author: Mizux

CMakeLists.txt

@@ -74,7 +74,7 @@ if(UNIX)
   endforeach()
 else()
   # Currently Only support static build for windows
-  option(BUILD_SHARED_LIBS "Build shared libraries (.dll)." OFF)
+  option(BUILD_SHARED_LIBS "Build shared libraries (.dll)." ON)
   set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
   set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})

cmake/cpp.cmake

@@ -45,9 +45,13 @@ set(OR_TOOLS_COMPILE_DEFINITIONS)
 set(OR_TOOLS_COMPILE_OPTIONS)
 set(OR_TOOLS_LINK_OPTIONS)
 
-if(BUILD_SHARED_LIBS)
-  list(APPEND OR_TOOLS_COMPILE_DEFINITIONS "OR_TOOLS_AS_DYNAMIC_LIB")
+if(MSVC AND BUILD_SHARED_LIBS)
+  list(APPEND OR_TOOLS_COMPILE_DEFINITIONS "OR_BUILD_DLL")
+  list(APPEND OR_TOOLS_COMPILE_DEFINITIONS "OR_PROTO_DLL=__declspec(dllimport)")
+ else()
+  list(APPEND OR_TOOLS_COMPILE_DEFINITIONS "OR_PROTO_DLL=")
 endif()
+
 # Optional built-in components
 if(BUILD_LP_PARSER)
   list(APPEND OR_TOOLS_COMPILE_DEFINITIONS "USE_LP_PARSER")
@@ -356,7 +360,7 @@ function(generate_proto_library)
      COMMAND ${PROTOC_PRG}
      "--proto_path=${PROJECT_SOURCE_DIR}"
      ${PROTO_DIRS}
-     "--cpp_out=${PROJECT_BINARY_DIR}"
+     "--cpp_out=dllexport_decl=OR_PROTO_DLL:${PROJECT_BINARY_DIR}"
      ${PROTO_FILE}
      DEPENDS ${PROTO_FILE} ${PROTOC_PRG}
      COMMENT "Generate C++ protocol buffer for ${PROTO_FILE}"
@@ -373,6 +377,12 @@ function(generate_proto_library)
  else()
    set_target_properties(${PROTO_NAME}_proto PROPERTIES CXX_STANDARD 17)
  endif()
+ if(MSVC AND BUILD_SHARED_LIBS)
+  target_compile_definitions(${PROTO_NAME}_proto INTERFACE "OR_PROTO_DLL=__declspec(dllimport)")
+  target_compile_definitions(${PROTO_NAME}_proto PRIVATE "OR_PROTO_DLL=__declspec(dllexport)")
+ else()
+  target_compile_definitions(${PROTO_NAME}_proto PUBLIC "OR_PROTO_DLL=")
+endif()
  set_target_properties(${PROTO_NAME}_proto PROPERTIES
    CXX_STANDARD_REQUIRED ON
    CXX_EXTENSIONS OFF
@@ -447,6 +457,9 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
 target_compile_features(${PROJECT_NAME} PUBLIC
   $<IF:$<CXX_COMPILER_ID:MSVC>,cxx_std_20,cxx_std_17>)
 target_compile_definitions(${PROJECT_NAME} PUBLIC ${OR_TOOLS_COMPILE_DEFINITIONS})
+if(MSVC AND BUILD_SHARED_LIBS)
+  target_compile_definitions(${PROJECT_NAME} PRIVATE OR_EXPORT)
+endif()
 target_compile_options(${PROJECT_NAME} PUBLIC ${OR_TOOLS_COMPILE_OPTIONS})
 target_link_options(${PROJECT_NAME} INTERFACE ${OR_TOOLS_LINK_OPTIONS})
 # Properties

cmake/python.cmake

@@ -450,11 +450,13 @@ set(need_unix_highs_lib "$<AND:${is_not_windows},$<BOOL:${BUILD_HIGHS}>>")
 set(need_windows_highs_lib "$<AND:${is_windows},$<BOOL:${BUILD_HIGHS}>>")
 
 set(is_ortools_shared "$<STREQUAL:$<TARGET_PROPERTY:ortools,TYPE>,SHARED_LIBRARY>")
+set(need_unix_ortools_lib "$<AND:${is_not_windows},${is_ortools_shared}>")
+set(need_windows_ortools_lib "$<AND:${is_windows},${is_ortools_shared}>")
 
 add_custom_command(
   OUTPUT python/ortools_timestamp
   COMMAND ${CMAKE_COMMAND} -E remove -f ortools_timestamp
-  COMMAND ${CMAKE_COMMAND} -E make_directory ${PYTHON_PROJECT}/.libs
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${PYTHON_PROJECT}/.libs 
   COMMAND ${CMAKE_COMMAND} -E
     $<IF:$<BOOL:${BUILD_ZLIB}>,copy,true>
     $<${need_unix_zlib_lib}:$<TARGET_SONAME_FILE:ZLIB::ZLIB>>
@@ -596,7 +598,8 @@ add_custom_command(
 
   COMMAND ${CMAKE_COMMAND} -E
     $<IF:${is_ortools_shared},copy,true>
-    $<${is_ortools_shared}:$<TARGET_SONAME_FILE:ortools>>
+	$<${need_unix_ortools_lib}:$<TARGET_SONAME_FILE:${PROJECT_NAMESPACE}::ortools>>
+    $<${need_windows_ortools_lib}:$<TARGET_FILE:${PROJECT_NAMESPACE}::ortools>>
     ${PYTHON_PROJECT}/.libs
   COMMAND ${CMAKE_COMMAND} -E touch ${PROJECT_BINARY_DIR}/python/ortools_timestamp
   MAIN_DEPENDENCY

ortools/base/CMakeLists.txt

@@ -26,8 +26,9 @@ target_compile_definitions(${NAME} PRIVATE
   -DOR_TOOLS_MAJOR=${PROJECT_VERSION_MAJOR}
   -DOR_TOOLS_MINOR=${PROJECT_VERSION_MINOR}
   -DOR_TOOLS_PATCH=${PROJECT_VERSION_PATCH})
-if(MSVC)
-  target_compile_definitions(${NAME} PRIVATE -DOR_TOOLS_EXPORTS)
+if(MSVC AND BUILD_SHARED_LIBS)
+  target_compile_definitions(${NAME} PUBLIC "OR_BUILD_DLL")
+  target_compile_definitions(${NAME} PRIVATE "OR_EXPORT")
 endif()
 target_include_directories(${NAME} PRIVATE
   ${PROJECT_SOURCE_DIR}

ortools/base/base_export.h

@@ -14,17 +14,17 @@
 #ifndef OR_TOOLS_BASE_BASE_EXPORT_H_
 #define OR_TOOLS_BASE_BASE_EXPORT_H_
 
-#if defined(_MSC_VER) && defined(OR_TOOLS_AS_DYNAMIC_LIB)
+#if defined(_MSC_VER) && defined(OR_BUILD_DLL)
 // Annoying stuff for windows -- makes sure clients can import these functions
-#if defined(OR_TOOLS_EXPORTS)
-#define BASE_EXPORT __declspec(dllexport)
+#if defined(OR_EXPORT)
+#define OR_DLL __declspec(dllexport)
 #else
-#define BASE_EXPORT __declspec(dllimport)
-#endif  // defined(OR_TOOLS_EXPORT)
-#endif  // _MSC_VER && OR_TOOLS_AS_DYNAMIC_LIB
+#define OR_DLL __declspec(dllimport)
+#endif  // defined(OR_EXPORT)
+#endif  // _MSC_VER && OR_BUILD_DLL
 
-#ifndef BASE_EXPORT
-#define BASE_EXPORT
+#ifndef OR_DLL
+#define OR_DLL
 #endif
 
 #endif  // OR_TOOLS_BASE_BASE_EXPORT_H_

ortools/base/macros.h

@@ -16,6 +16,8 @@
 
 #include <cstdlib>  // for size_t.
 
+#include "ortools/base/base_export.h" // for OR_DLL
+
 #define COMPILE_ASSERT(x, msg)
 
 #ifdef NDEBUG

ortools/math_opt/core/CMakeLists.txt

@@ -20,6 +20,10 @@ list(FILTER _SRCS EXCLUDE REGEX "/[^/]*_test\\.cc$")
 set(NAME ${PROJECT_NAME}_math_opt_core)
 add_library(${NAME} OBJECT ${_SRCS})
 set_target_properties(${NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+if(MSVC AND BUILD_SHARED_LIBS)
+  target_compile_definitions(${NAME} PUBLIC "OR_BUILD_DLL")
+  target_compile_definitions(${NAME} PRIVATE "OR_EXPORT")
+endif()
 target_include_directories(${NAME} PUBLIC
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)

ortools/math_opt/core/solver_debug.h

@@ -17,6 +17,8 @@
 #include <atomic>
 #include <cstdint>
 
+#include <ortools/base/base_export.h>
+
 namespace operations_research {
 namespace math_opt {
 namespace internal {
@@ -26,7 +28,7 @@ namespace internal {
 // This variable is intended to be used by MathOpt unit tests in other languages
 // to test the proper garbage collection. It should never be used in any other
 // context.
-extern std::atomic<int64_t> debug_num_solver;
+OR_DLL extern std::atomic<int64_t> debug_num_solver;
 
 }  // namespace internal
 }  // namespace math_opt

ortools/util/CMakeLists.txt

@@ -22,6 +22,10 @@ add_library(${NAME} OBJECT ${_SRCS})
 set_target_properties(${NAME} PROPERTIES
   POSITION_INDEPENDENT_CODE ON
   )
+if(MSVC AND BUILD_SHARED_LIBS)
+  target_compile_definitions(${NAME} PUBLIC "OR_BUILD_DLL")
+  target_compile_definitions(${NAME} PRIVATE "OR_EXPORT")
+endif()
 target_include_directories(${NAME} PRIVATE
   ${PROJECT_SOURCE_DIR}
   ${PROJECT_BINARY_DIR})

ortools/util/time_limit.h

@@ -91,7 +91,7 @@ namespace operations_research {
  */
 // TODO(user): The expression "deterministic time" should be replaced with
 //                 "number of operations" to avoid confusion with "real" time.
-class TimeLimit {
+class OR_DLL TimeLimit {
  public:
   static const double kSafetyBufferSeconds;  // See the .cc for the value.
   static const int kHistorySize;