Skip to content

Commit 5766cdb

Browse files
committed
sat: cmake fix flag export on windows
1 parent f47edbd commit 5766cdb

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

ortools/sat/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ add_library(${NAME} OBJECT ${_SRCS})
2727
set_target_properties(${NAME} PROPERTIES
2828
POSITION_INDEPENDENT_CODE ON
2929
)
30+
if(MSVC AND BUILD_SHARED_LIBS)
31+
target_compile_definitions(${NAME} PUBLIC "OR_BUILD_DLL")
32+
target_compile_definitions(${NAME} PRIVATE "OR_EXPORT")
33+
endif()
3034
target_include_directories(${NAME} PRIVATE
3135
${PROJECT_SOURCE_DIR}
3236
${PROJECT_BINARY_DIR})

ortools/sat/cp_model_solver.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@
1919

2020
#include "absl/flags/declare.h"
2121
#include "absl/strings/string_view.h"
22+
#include "ortools/base/base_export.h"
2223
#include "ortools/sat/cp_model.pb.h"
2324
#include "ortools/sat/model.h"
2425
#include "ortools/sat/sat_parameters.pb.h"
2526

26-
ABSL_DECLARE_FLAG(bool, cp_model_dump_response);
27-
ABSL_DECLARE_FLAG(bool, cp_model_drat_check);
28-
ABSL_DECLARE_FLAG(bool, cp_model_lrat_check);
27+
OR_DLL ABSL_DECLARE_FLAG(bool, cp_model_dump_response);
28+
OR_DLL ABSL_DECLARE_FLAG(bool, cp_model_drat_check);
29+
OR_DLL ABSL_DECLARE_FLAG(bool, cp_model_lrat_check);
2930

3031
namespace operations_research {
3132
namespace sat {

ortools/sat/cp_model_utils.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,17 @@
3535
#include "absl/types/span.h"
3636
#include "google/protobuf/message.h"
3737
#include "google/protobuf/text_format.h"
38+
#include "ortools/base/base_export.h"
3839
#include "ortools/base/hash.h"
3940
#include "ortools/base/options.h"
4041
#include "ortools/sat/cp_model.pb.h"
4142
#include "ortools/util/bitset.h"
4243
#include "ortools/util/sorted_interval_list.h"
4344

44-
ABSL_DECLARE_FLAG(bool, cp_model_dump_models);
45-
ABSL_DECLARE_FLAG(std::string, cp_model_dump_prefix);
46-
ABSL_DECLARE_FLAG(bool, cp_model_dump_problematic_lns);
47-
ABSL_DECLARE_FLAG(bool, cp_model_dump_submodels);
45+
OR_DLL ABSL_DECLARE_FLAG(bool, cp_model_dump_models);
46+
OR_DLL ABSL_DECLARE_FLAG(std::string, cp_model_dump_prefix);
47+
OR_DLL ABSL_DECLARE_FLAG(bool, cp_model_dump_problematic_lns);
48+
OR_DLL ABSL_DECLARE_FLAG(bool, cp_model_dump_submodels);
4849

4950
namespace operations_research {
5051
namespace sat {

ortools/sat/presolve_context.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "absl/strings/str_cat.h"
3030
#include "absl/strings/string_view.h"
3131
#include "absl/types/span.h"
32+
#include "ortools/base/base_export.h"
3233
#include "ortools/base/logging.h"
3334
#include "ortools/sat/cp_model.pb.h"
3435
#include "ortools/sat/cp_model_utils.h"
@@ -44,7 +45,7 @@
4445
#include "ortools/util/sorted_interval_list.h"
4546
#include "ortools/util/time_limit.h"
4647

47-
ABSL_DECLARE_FLAG(bool, cp_model_debug_postsolve);
48+
OR_DLL ABSL_DECLARE_FLAG(bool, cp_model_debug_postsolve);
4849

4950
namespace operations_research {
5051
namespace sat {

0 commit comments

Comments
 (0)