Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Omit "with options" unless QUIET is off #515

Merged
merged 2 commits into from
Oct 26, 2016
Merged

Omit "with options" unless QUIET is off #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66d1ced
Minor OS X fix
Oct 25, 2016
2e602e5
Omit "with options" unless QUIET is off
Oct 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CommonCompiler.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions CommonFindPackage.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion GitInfo.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "<no-tag>")
set(GIT_STATE "<no-tag>")
endif()
string(REPLACE "* " "" GIT_BRANCH ${GIT_BRANCH})

Expand Down