Skip to content

Commit a782359

Browse files
committed
make: fix runtime nupkg on windows
1 parent 38aa148 commit a782359

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

makefiles/Makefile.dotnet.mk

+7-1
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,14 @@ $(TEMP_DOTNET_DIR)/$(DOTNET_ORTOOLS_RUNTIME_ASSEMBLY_NAME)/$(DOTNET_ORTOOLS_RUNT
419419
$(TEMP_DOTNET_DIR)$S$(DOTNET_ORTOOLS_RUNTIME_ASSEMBLY_NAME)$S$(DOTNET_ORTOOLS_RUNTIME_ASSEMBLY_NAME).csproj
420420
$(SED) -i -e 's/$$<TARGET_FILE:google-ortools-native>/..\/..\/lib\/$(DOTNET_ORTOOLS_NATIVE).$(SWIG_DOTNET_LIB_SUFFIX)/' \
421421
$(TEMP_DOTNET_DIR)$S$(DOTNET_ORTOOLS_RUNTIME_ASSEMBLY_NAME)$S$(DOTNET_ORTOOLS_RUNTIME_ASSEMBLY_NAME).csproj
422-
$(SED) -i -e 's/$$<$$<STREQUAL.*@PROJECT_NAME@>>/;..\/..\/lib\/$(LIB_PREFIX)ortools.$L;..\/..\/dependencies\/install\/lib*\/*.$L*/' \
422+
ifeq ($(SYSTEM),win)
423+
$(SED) -i -e 's/$$<$$<STREQUAL.*@PROJECT_NAME@>>//' \
424+
$(TEMP_DOTNET_DIR)$S$(DOTNET_ORTOOLS_RUNTIME_ASSEMBLY_NAME)$S$(DOTNET_ORTOOLS_RUNTIME_ASSEMBLY_NAME).csproj
425+
else
426+
$(SED) -i -e 's/$$<$$<STREQUAL.*@PROJECT_NAME@>>/;..\/..\/lib\/$(LIB_PREFIX)ortools.$L/' \
423427
$(TEMP_DOTNET_DIR)$S$(DOTNET_ORTOOLS_RUNTIME_ASSEMBLY_NAME)$S$(DOTNET_ORTOOLS_RUNTIME_ASSEMBLY_NAME).csproj
428+
endif
429+
424430

425431
$(DOTNET_ORTOOLS_RUNTIME_NUPKG): \
426432
$(LIB_DIR)/$(DOTNET_ORTOOLS_NATIVE).$(SWIG_DOTNET_LIB_SUFFIX) \

0 commit comments

Comments
 (0)