diff --git a/CMakeLists.txt b/CMakeLists.txt index 643537d..174f7a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -181,11 +181,15 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) # We pick it from environment if it is not defined in another way if(WIN32) if(EXISTS "${CMAKE_SOURCE_DIR}/scripts/hooks/pre-commit" AND EXISTS "${CMAKE_SOURCE_DIR}/.git") - message(STATUS ".git: directory") - configure_file( - "${CMAKE_SOURCE_DIR}/scripts/hooks/pre-commit" - "${CMAKE_SOURCE_DIR}/.git/hooks/pre-commit" - ) + if(IS_DIRECTORY "${CMAKE_SOURCE_DIR}/.git") + message(STATUS ".git: directory") + configure_file( + "${CMAKE_SOURCE_DIR}/scripts/hooks/pre-commit" + "${CMAKE_SOURCE_DIR}/.git/hooks/pre-commit" + ) + else() + message(STATUS "skip pre-commit git hook") + endif() endif() find_package(PkgConfig REQUIRED) @@ -567,12 +571,12 @@ foreach(po_file ${QDT_L10N_PO_FILES}) endforeach() # copy pt-BR/QidiStudio.mo to pt_br/ -SET(PT_BR "${L10N_DIR}/pt-BR/QIDIStudio.mo") -SET(PT_BR_DST "${L10N_DIR}/pt_br/") -add_custom_command( - TARGET gettext_po_to_mo POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PT_BR} ${PT_BR_DST} -) +#SET(PT_BR "${L10N_DIR}/pt-BR/QIDIStudio.mo") +#SET(PT_BR_DST "${L10N_DIR}/pt_br/") +#add_custom_command( +# TARGET gettext_po_to_mo POST_BUILD +# COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PT_BR} ${PT_BR_DST} +#) find_package(NLopt 1.4 REQUIRED) diff --git a/resources/profiles/Q Series.json b/resources/profiles/Q Series.json index eb56531..34580d9 100644 --- a/resources/profiles/Q Series.json +++ b/resources/profiles/Q Series.json @@ -1,6 +1,6 @@ { "name": "Q Series", - "version": "02.04.00.71", + "version": "02.04.00.70", "force_update": "0", "description": "Q Series configurations", "machine_model_list": [ diff --git a/resources/profiles/X 3 Series.json b/resources/profiles/X 3 Series.json index 13ad1c5..5b1594e 100644 --- a/resources/profiles/X 3 Series.json +++ b/resources/profiles/X 3 Series.json @@ -1,6 +1,6 @@ { "name": "X-3-Series", - "version": "02.04.00.71", + "version": "02.04.00.70", "force_update": "0", "description": "X-3-Series configurations", "machine_model_list": [ diff --git a/resources/profiles/X 4 Series.json b/resources/profiles/X 4 Series.json index 3625cab..026d334 100644 --- a/resources/profiles/X 4 Series.json +++ b/resources/profiles/X 4 Series.json @@ -1,6 +1,6 @@ { "name": "X-4-Series", - "version": "02.04.00.71", + "version": "02.04.00.70", "force_update": "0", "description": "X-4-Series configurations", "machine_model_list": [ diff --git a/version.inc b/version.inc index 63d0536..63beb18 100644 --- a/version.inc +++ b/version.inc @@ -13,7 +13,7 @@ endif() # The build_version should start from 50 in master branch -set(SLIC3R_VERSION "02.03.01.70") +set(SLIC3R_VERSION "02.04.00.70") string(REPLACE "." "," SLIC3R_COMMA_SEPARATED_VERSION ${SLIC3R_VERSION}) -set(SLIC3R_COMMA_SEPARATED_VERSION "${SLIC3R_COMMA_SEPARATED_VERSION}") +set(SLIC3R_COMMA_SEPARATED_VERSION "${SLIC3R_COMMA_SEPARATED_VERSION}") \ No newline at end of file