diff --git a/CommonCompiler.cmake b/CommonCompiler.cmake index 857c534..f67306a 100644 --- a/CommonCompiler.cmake +++ b/CommonCompiler.cmake @@ -223,7 +223,7 @@ function(common_compile_options Name) if(TARGET Qt5::Widgets) set_target_properties(${Name} PROPERTIES AUTOUIC TRUE) endif() - if(CMAKE_COMPILER_IS_GCC) + if(CMAKE_COMPILER_IS_GCC AND NOT APPLE) set_target_properties(${Name} PROPERTIES LINK_FLAGS "-Wl,--no-as-needed") endif() endif() diff --git a/CommonFindPackage.cmake b/CommonFindPackage.cmake index e4cc205..51b0b65 100644 --- a/CommonFindPackage.cmake +++ b/CommonFindPackage.cmake @@ -264,13 +264,13 @@ macro(common_find_package_post) endif() set(__configure_msg "${PROJECT_NAME} [${GIT_STATE}]") - if(${PROJECT_NAME}_FIND_PACKAGES_FOUND) + if(${PROJECT_NAME}_FIND_PACKAGES_FOUND AND NOT COMMON_FIND_PACKAGE_QUIET) set(__configure_msg "${__configure_msg} with${${PROJECT_NAME}_FIND_PACKAGES_FOUND}") endif() if(${PROJECT_NAME}_FIND_PACKAGES_NOTFOUND) set(__configure_msg - "${__configure_msg} WITHOUT${${PROJECT_NAME}_FIND_PACKAGES_NOTFOUND}") + "${__configure_msg} without${${PROJECT_NAME}_FIND_PACKAGES_NOTFOUND}") endif() common_graph(${PROJECT_NAME}) message(STATUS ${__configure_msg}) diff --git a/GitInfo.cmake b/GitInfo.cmake index 8c1471a..408f8c7 100644 --- a/GitInfo.cmake +++ b/GitInfo.cmake @@ -68,7 +68,7 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/.git) set(GIT_ROOT_URL ${GIT_ORIGIN_URL}) endif() if(NOT GIT_STATE) - set(GIT_STATE "") + set(GIT_STATE "") endif() string(REPLACE "* " "" GIT_BRANCH ${GIT_BRANCH})