diff --git a/cmake/flatzinc.cmake b/cmake/flatzinc.cmake index 434804014f..41c353ccc5 100644 --- a/cmake/flatzinc.cmake +++ b/cmake/flatzinc.cmake @@ -136,7 +136,10 @@ add_executable(${PROJECT_NAME}::fz ALIAS fz) file(RELATIVE_PATH FZ_REL_INSTALL_BINARY ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/minizinc/solvers ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/fz) -configure_file(ortools/flatzinc/ortools.msc.in ortools.msc) +configure_file( + ortools/flatzinc/ortools.msc.in + ortools.msc + @ONLY) # Install rules include(GNUInstallDirs) diff --git a/makefiles/Makefile.cpp.mk b/makefiles/Makefile.cpp.mk index 0acc4b6a6b..90d5420ad2 100644 --- a/makefiles/Makefile.cpp.mk +++ b/makefiles/Makefile.cpp.mk @@ -251,9 +251,17 @@ $(FLATZINC_LIBS): $(OR_TOOLS_LIBS) $(FLATZINC_OBJS) | $(LIB_DIR) .PHONY: fz # Build Flatzinc binaries. fz: \ + $(BIN_DIR)/ortools.msc \ $(BIN_DIR)/fz$E \ $(BIN_DIR)/parser_main$E +$(BIN_DIR)/ortools.msc: $(SRC_DIR)/ortools/flatzinc/ortools.msc.in | $(BIN_DIR) + $(SED) -e "s/@PROJECT_VERSION@/$(OR_TOOLS_VERSION)/" \ + ortools$Sflatzinc$Sortools.msc.in \ + > $(BIN_DIR)$Sortools.msc + $(SED) -i -e "s/@FZ_REL_INSTALL_BINARY@/.\/fz$E/" \ + $(BIN_DIR)$Sortools.msc + $(BIN_DIR)/fz$E: $(OBJ_DIR)/flatzinc/fz.$O $(FLATZINC_LIBS) $(OR_TOOLS_LIBS) | $(BIN_DIR) $(CCC) $(CFLAGS) $(OBJ_DIR)$Sflatzinc$Sfz.$O $(FLATZINC_LNK) $(OR_TOOLS_LDFLAGS) $(EXE_OUT)$(BIN_DIR)$Sfz$E @@ -719,6 +727,7 @@ clean_cc: -$(DEL) $(OBJ_DIR)$Sport$S*.$O -$(DEL) $(OBJ_DIR)$Ssat$S*.$O -$(DEL) $(OBJ_DIR)$Sutil$S*.$O + -$(DEL) $(BIN_DIR)$Sortools.msc -$(DEL) $(BIN_DIR)$Sfz$E -$(DEL) $(BIN_DIR)$Sparser_main$E -$(DEL) $(BIN_DIR)$Ssat_runner$E diff --git a/ortools/flatzinc/ortools.msc.in b/ortools/flatzinc/ortools.msc.in index 64b9ec93f8..2d2ef4e220 100644 --- a/ortools/flatzinc/ortools.msc.in +++ b/ortools/flatzinc/ortools.msc.in @@ -2,9 +2,9 @@ "id": "com.google.or-tools", "name": "OR Tools", "description": "Google's Operations Research tools FlatZinc interface", - "version": "${ortools_VERSION_MAJOR}.${ortools_VERSION_MINOR}.${ortools_VERSION_PATCH}", + "version": "@PROJECT_VERSION@", "mznlib": "../ortools", - "executable": "${FZ_REL_INSTALL_BINARY}", + "executable": "@FZ_REL_INSTALL_BINARY@", "tags": ["ortools", "cp", "lcg", "float", "int"], "stdFlags": ["-a","-f","-n","-p","-r","-s","-v"], "extraFlags": [