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

Quiet option fix #376

Merged
merged 2 commits into from
Feb 3, 2022
Merged

Quiet option fix #376

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a679d5b
Move compile definitions before subdirectory add
hellkite500 Feb 2, 2022
bc31de2
re-add ET_QUIET and NGEN_QUIET
hellkite500 Feb 2, 2022
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
28 changes: 18 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,24 @@ target_include_directories(ngen PUBLIC
#add_subdirectory("extern/cfe")
#add_subdirectory("extern/test_bmi_c")

if(QUIET)
set(UDUNITS_QUIET true)
set(ET_QUIET true)
set(NGEN_QUIET true)
endif()

if(UDUNITS_QUIET)
add_compile_definitions(UDUNITS_QUIET)
endif()

if(ET_QUIET)
add_compile_definitions(ET_QUIET)
endif()

if(NGEN_QUIET)
add_compile_definitions(NGEN_QUIET)
endif()

add_subdirectory("src/core")
add_dependencies(core libudunits2)
add_subdirectory("src/geojson")
Expand Down Expand Up @@ -335,16 +353,6 @@ if(PACKAGE_TESTS)
add_subdirectory(test)
endif()

if(QUIET)
set(UDUNITS_QUIET true)
set(ET_QUIET true)
set(NGEN_QUIET true)
endif()

if(UDUNITS_QUIET)
add_compile_definitions(UDUNITS_QUIET)
endif()

#add_library(Hymod ${HYMOD_INCLUDE_DIR}/Hymod.h)
#set_target_properties(Hymod PROPERTIES LINKER_LANGUAGE CXX)

Expand Down