diff --git a/cmake/myx/MyxCMakeConfigVersion.cmake b/cmake/myx/MyxCMakeConfigVersion.cmake index 5ae5153..c6b6816 100644 --- a/cmake/myx/MyxCMakeConfigVersion.cmake +++ b/cmake/myx/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "1.99.75") +set(MYX_CMAKE_PACKAGE_VERSION "1.99.76") if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/cmake/myx/lib/Qt5TargetSetup.cmake b/cmake/myx/lib/Qt5TargetSetup.cmake index a0923b4..7f62ec9 100644 --- a/cmake/myx/lib/Qt5TargetSetup.cmake +++ b/cmake/myx/lib/Qt5TargetSetup.cmake @@ -7,28 +7,28 @@ function(myx_qt5_target_setup NAME) cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - get_target_property(type ${NAME} TYPE) + get_target_property(target_type ${NAME} TYPE) foreach(iter ${ARG_COMPONENTS}) - if(type STREQUAL "INTERFACE_LIBRARY") + if(target_type STREQUAL "INTERFACE_LIBRARY") target_include_directories(${NAME} INTERFACE ${Qt5${iter}_INCLUDE_DIRS}) else() target_include_directories(${NAME} PRIVATE ${Qt5${iter}_INCLUDE_DIRS}) endif() - if(type STREQUAL "EXECUTABLE" AND NOT iter STREQUAL "LinguistTools") + if(target_type STREQUAL "EXECUTABLE" AND NOT iter STREQUAL "LinguistTools") target_link_libraries(${NAME} PRIVATE "Qt5::${iter}") endif() endforeach() foreach(iter ${ARG_PRIVATE}) - if(type STREQUAL "INTERFACE_LIBRARY") + if(target_type STREQUAL "INTERFACE_LIBRARY") target_include_directories(${NAME} INTERFACE ${Qt5${iter}_PRIVATE_INCLUDE_DIRS}) else() target_include_directories(${NAME} PRIVATE ${Qt5${iter}_PRIVATE_INCLUDE_DIRS}) endif() endforeach() - if(type STREQUAL "EXECUTABLE") + if(target_type STREQUAL "EXECUTABLE") target_compile_options(${NAME} PRIVATE ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}) endif() diff --git a/cmake/myx/lib/TargetSetup.cmake b/cmake/myx/lib/TargetSetup.cmake index fbc9a90..323f397 100644 --- a/cmake/myx/lib/TargetSetup.cmake +++ b/cmake/myx/lib/TargetSetup.cmake @@ -12,7 +12,7 @@ function(myx_target_setup NAME) myx_message_fatal_error("Target ${NAME} does not exists.") endif() - get_target_property(type ${NAME} TYPE) + get_target_property(target_type ${NAME} TYPE) foreach(iter ${ARG_PACKAGES}) target_include_directories(${NAME} PRIVATE ${${iter}_INCLUDE_DIRS}) @@ -48,7 +48,7 @@ function(myx_target_setup NAME) file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/include") endif() - if(NOT type STREQUAL "INTERFACE_LIBRARY") + if(NOT target_type STREQUAL "INTERFACE_LIBRARY") target_include_directories(${PROJECT_NAME} PRIVATE $) @@ -58,7 +58,7 @@ function(myx_target_setup NAME) endif() endif() - if(type STREQUAL "EXECUTABLE") + if(target_type STREQUAL "EXECUTABLE") if(IS_DIRECTORY "${PROJECT_SOURCE_DIR}/include") target_include_directories(${PROJECT_NAME} PRIVATE $) diff --git a/cmake/myx_setup.cmake b/cmake/myx_setup.cmake index 984fff9..7685012 100644 --- a/cmake/myx_setup.cmake +++ b/cmake/myx_setup.cmake @@ -16,11 +16,11 @@ if(MYX_CMAKE_DIR) set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR}) endif() if(DEFINED ENV{MYX_CMAKE_DIR}) - find_package(MyxCMake 1.99.75 CONFIG PATHS $ENV{MYX_CMAKE_DIR} NO_DEFAULT_PATH REQUIRED) + find_package(MyxCMake 1.99.76 CONFIG PATHS $ENV{MYX_CMAKE_DIR} NO_DEFAULT_PATH REQUIRED) myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===") else() if(MYX_CMAKE_USE_SYSTEM) - find_package(MyxCMake 1.99.75 REQUIRED) + find_package(MyxCMake 1.99.76 REQUIRED) myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===") else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)