diff --git a/cmake/flatzinc.cmake b/cmake/flatzinc.cmake index 7192a0fb401..952503d130c 100644 --- a/cmake/flatzinc.cmake +++ b/cmake/flatzinc.cmake @@ -118,7 +118,7 @@ endif() add_library(${PROJECT_NAMESPACE}::flatzinc ALIAS flatzinc) -# fzn-cp-sat-lp Binary +# fzn-cp-sat Binary add_executable(fzn ortools/flatzinc/fz.cc ) @@ -132,7 +132,7 @@ set_target_properties(fzn PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS OFF - OUTPUT_NAME fzn-cp-sat-lp + OUTPUT_NAME fzn-cp-sat ) target_compile_features(fzn PUBLIC cxx_std_17) target_compile_definitions(fzn PUBLIC ${FLATZINC_COMPILE_DEFINITIONS}) @@ -168,7 +168,7 @@ set_target_properties(fzn-parser_test PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS OFF - OUTPUT_NAME fzn-parser-cp-sat-lp + OUTPUT_NAME fzn-parser-cp-sat ) target_compile_features(fzn-parser_test PUBLIC cxx_std_17) target_compile_definitions(fzn-parser_test PUBLIC ${FLATZINC_COMPILE_DEFINITIONS}) @@ -182,10 +182,10 @@ add_executable(${PROJECT_NAME}::fzn-parser_test ALIAS fzn-parser_test) # MiniZinc solver configuration file(RELATIVE_PATH FZ_REL_INSTALL_BINARY ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/minizinc/solvers - ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/fzn-cp-sat-lp) + ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/fzn-cp-sat) configure_file( - ortools/flatzinc/cpsatlp.msc.in - ${PROJECT_BINARY_DIR}/cpsatlp.msc + ortools/flatzinc/cpsat.msc.in + ${PROJECT_BINARY_DIR}/cpsat.msc @ONLY) # Install rules @@ -199,7 +199,7 @@ install(TARGETS flatzinc fzn #fzn-parser_test ) install(DIRECTORY ortools/flatzinc/mznlib/ - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/minizinc/cpsatlp + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/minizinc/cpsat FILES_MATCHING PATTERN "*.mzn") -install(FILES ${PROJECT_BINARY_DIR}/cpsatlp.msc +install(FILES ${PROJECT_BINARY_DIR}/cpsat.msc DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/minizinc/solvers) diff --git a/ortools/flatzinc/cpsatlp.msc.in b/ortools/flatzinc/cpsat.msc.in similarity index 90% rename from ortools/flatzinc/cpsatlp.msc.in rename to ortools/flatzinc/cpsat.msc.in index c294a68f3da..ffc97d0d182 100644 --- a/ortools/flatzinc/cpsatlp.msc.in +++ b/ortools/flatzinc/cpsat.msc.in @@ -1,9 +1,9 @@ { "id": "com.google.ortools.sat", - "name": "OR Tools CP-SAT-LP", + "name": "OR Tools CP-SAT", "description": "Google's Operations Research CP-SAT-LP FlatZinc interface", "version": "@PROJECT_VERSION@", - "mznlib": "../cpsatlp", + "mznlib": "../cpsat", "executable": "@FZ_REL_INSTALL_BINARY@", "tags": ["cpsatlp", "cp", "lcg", "int"], "stdFlags": ["-a", "-f", "-p", "-r", "-s", "-v"],