CMake: fix dotnet_<targets>

cmake/dotnet.cmake

@@ -61,9 +61,10 @@ if(USE_COINOR)
 endif()
 list(APPEND CMAKE_SWIG_FLAGS ${FLAGS} "-I${PROJECT_SOURCE_DIR}")
 
+set(OR_TOOLS_DOTNET Google.OrTools)
 foreach(SUBPROJECT IN ITEMS algorithms graph linear_solver constraint_solver sat util)
   add_subdirectory(ortools/${SUBPROJECT}/csharp)
-  list(APPEND dotnet_native_targets ${PROJECT_NAME}::dotnet_${SUBPROJECT})
+  list(APPEND dotnet_native_targets dotnet_${SUBPROJECT})
 endforeach()
 
 # Build or retrieve .snk file
@@ -102,8 +103,8 @@ set(OR_TOOLS_DOTNET_NATIVE Google.OrTools.runtime.${RUNTIME_IDENTIFIER})
 add_custom_target(dotnet_native
   DEPENDS
     dotnet/or-tools.snk
-    ortools::ortools
     Dotnet${PROJECT_NAME}_proto
+    ${dotnet_native_targets}
     ${PROJECT_BINARY_DIR}/dotnet/${OR_TOOLS_DOTNET_NATIVE}/${OR_TOOLS_DOTNET_NATIVE}.csproj
   COMMAND ${CMAKE_COMMAND} -E make_directory packages
   COMMAND ${DOTNET_CLI} build -c Release /p:Platform=x64 ${OR_TOOLS_DOTNET_NATIVE}/${OR_TOOLS_DOTNET_NATIVE}.csproj
@@ -118,7 +119,6 @@ configure_file(
 
 
 # Main Target
-set(OR_TOOLS_DOTNET Google.OrTools)
 
 add_custom_target(dotnet_package ALL
   DEPENDS

ortools/algorithms/csharp/CMakeLists.txt

@@ -4,12 +4,12 @@ set_property(SOURCE knapsack_solver.i PROPERTY COMPILE_OPTIONS
   -namespace ${OR_TOOLS_DOTNET}.Algorithms
   -dllimport google-ortools-native
   )
-swig_add_library(operations_research_algorithms
+swig_add_library(dotnet_algorithms
   TYPE OBJECT
   LANGUAGE csharp
   OUTPUT_DIR ${PROJECT_BINARY_DIR}/dotnet/${PROJECT_NAME}/algorithms
   SOURCES knapsack_solver.i)
 
-#target_include_directories(operations_research_algorithms PRIVATE ${DOTNET_INCLUDE_DIRS})
-set_property(TARGET operations_research_algorithms PROPERTY SWIG_USE_TARGET_INCLUDE_DIRECTORIES ON)
-target_link_libraries(operations_research_algorithms PRIVATE ortools::ortools)
+#target_include_directories(dotnet_algorithms PRIVATE ${DOTNET_INCLUDE_DIRS})
+set_property(TARGET dotnet_algorithms PROPERTY SWIG_USE_TARGET_INCLUDE_DIRECTORIES ON)
+target_link_libraries(dotnet_algorithms PRIVATE ortools::ortools)

ortools/constraint_solver/csharp/CMakeLists.txt

@@ -4,12 +4,12 @@ set_property(SOURCE routing.i PROPERTY COMPILE_OPTIONS
   -namespace ${OR_TOOLS_DOTNET}.ConstraintSolver
   -dllimport google-ortools-native
   )
-swig_add_library(operations_research_constraint_solver
+swig_add_library(dotnet_constraint_solver
   TYPE OBJECT
   LANGUAGE csharp
   OUTPUT_DIR ${PROJECT_BINARY_DIR}/dotnet/${PROJECT_NAME}/constraint_solver
   SOURCES routing.i)
 
-#target_include_directories(operations_research_constraint_solver PRIVATE ${DOTNET_INCLUDE_DIRS})
-set_property(TARGET operations_research_constraint_solver PROPERTY SWIG_USE_TARGET_INCLUDE_DIRECTORIES ON)
-target_link_libraries(operations_research_constraint_solver PRIVATE ortools::ortools)
+#target_include_directories(dotnet_constraint_solver PRIVATE ${DOTNET_INCLUDE_DIRS})
+set_property(TARGET dotnet_constraint_solver PROPERTY SWIG_USE_TARGET_INCLUDE_DIRECTORIES ON)
+target_link_libraries(dotnet_constraint_solver PRIVATE ortools::ortools)

ortools/graph/csharp/CMakeLists.txt

@@ -4,12 +4,12 @@ set_property(SOURCE graph.i PROPERTY COMPILE_OPTIONS
   -namespace ${OR_TOOLS_DOTNET}.Graph
   -dllimport google-ortools-native
   )
-swig_add_library(operations_research_graph
+swig_add_library(dotnet_graph
   TYPE OBJECT
   LANGUAGE csharp
   OUTPUT_DIR ${PROJECT_BINARY_DIR}/dotnet/${PROJECT_NAME}/graph
   SOURCES graph.i)
 
-#target_include_directories(operations_research_graph PRIVATE ${DOTNET_INCLUDE_DIRS})
-set_property(TARGET operations_research_graph PROPERTY SWIG_USE_TARGET_INCLUDE_DIRECTORIES ON)
-target_link_libraries(operations_research_graph PRIVATE ortools::ortools)
+#target_include_directories(dotnet_graph PRIVATE ${DOTNET_INCLUDE_DIRS})
+set_property(TARGET dotnet_graph PROPERTY SWIG_USE_TARGET_INCLUDE_DIRECTORIES ON)
+target_link_libraries(dotnet_graph PRIVATE ortools::ortools)

ortools/linear_solver/csharp/CMakeLists.txt

@@ -4,12 +4,12 @@ set_property(SOURCE linear_solver.i PROPERTY COMPILE_OPTIONS
   -namespace ${OR_TOOLS_DOTNET}.LinearSolver
   -dllimport google-ortools-native
   )
-swig_add_library(operations_research_linear_solver
+swig_add_library(dotnet_linear_solver
   TYPE OBJECT
   LANGUAGE csharp
   OUTPUT_DIR ${PROJECT_BINARY_DIR}/dotnet/${PROJECT_NAME}/linear_solver
   SOURCES linear_solver.i)
 
-#target_include_directories(operations_research_linear_solver PRIVATE ${DOTNET_INCLUDE_DIRS})
-set_property(TARGET operations_research_linear_solver PROPERTY SWIG_USE_TARGET_INCLUDE_DIRECTORIES ON)
-target_link_libraries(operations_research_linear_solver PRIVATE ortools::ortools)
+#target_include_directories(dotnet_linear_solver PRIVATE ${DOTNET_INCLUDE_DIRS})
+set_property(TARGET dotnet_linear_solver PROPERTY SWIG_USE_TARGET_INCLUDE_DIRECTORIES ON)
+target_link_libraries(dotnet_linear_solver PRIVATE ortools::ortools)

ortools/sat/csharp/CMakeLists.txt

@@ -4,12 +4,12 @@ set_property(SOURCE sat.i PROPERTY COMPILE_OPTIONS
   -namespace ${OR_TOOLS_DOTNET}.Sat
   -dllimport google-ortools-native
   )
-swig_add_library(operations_research_sat
+swig_add_library(dotnet_sat
   TYPE OBJECT
   LANGUAGE csharp
   OUTPUT_DIR ${PROJECT_BINARY_DIR}/dotnet/${PROJECT_NAME}/sat
   SOURCES sat.i)
 
-#target_include_directories(operations_research_sat PRIVATE ${DOTNET_INCLUDE_DIRS})
-set_property(TARGET operations_research_sat PROPERTY SWIG_USE_TARGET_INCLUDE_DIRECTORIES ON)
-target_link_libraries(operations_research_sat PRIVATE ortools::ortools)
+#target_include_directories(dotnet_sat PRIVATE ${DOTNET_INCLUDE_DIRS})
+set_property(TARGET dotnet_sat PROPERTY SWIG_USE_TARGET_INCLUDE_DIRECTORIES ON)
+target_link_libraries(dotnet_sat PRIVATE ortools::ortools)

ortools/util/csharp/CMakeLists.txt

@@ -4,12 +4,12 @@ set_property(SOURCE sorted_interval_list.i PROPERTY COMPILE_OPTIONS
   -namespace ${OR_TOOLS_DOTNET}.Util
   -dllimport google-ortools-native
   )
-swig_add_library(operations_research_util
+swig_add_library(dotnet_util
   TYPE OBJECT
   LANGUAGE csharp
   OUTPUT_DIR ${PROJECT_BINARY_DIR}/dotnet/${PROJECT_NAME}/util
   SOURCES sorted_interval_list.i)
 
-#target_include_directories(operations_research_util PRIVATE ${DOTNET_INCLUDE_DIRS})
-set_property(TARGET operations_research_util PROPERTY SWIG_USE_TARGET_INCLUDE_DIRECTORIES ON)
-target_link_libraries(operations_research_util PRIVATE ortools::ortools)
+#target_include_directories(dotnet_util PRIVATE ${DOTNET_INCLUDE_DIRS})
+set_property(TARGET dotnet_util PROPERTY SWIG_USE_TARGET_INCLUDE_DIRECTORIES ON)
+target_link_libraries(dotnet_util PRIVATE ortools::ortools)