From 1fe6ffa20cc17d67e82cbb0242ebb77af1f0cce2 Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Mon, 11 Oct 2021 09:16:45 +1300 Subject: [PATCH 1/2] CMake: Always build gie if testing is requested --- src/CMakeLists.txt | 3 ++- src/bin_gie.cmake | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 534bc311b7..51c31ab921 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -69,7 +69,8 @@ if(BUILD_PROJINFO) set(BIN_TARGETS ${BIN_TARGETS} binprojinfo) endif() -if(BUILD_GIE) +# Always build gie if testing is requested +if(BUILD_TESTING) include(bin_gie.cmake) set(BIN_TARGETS ${BIN_TARGETS} gie) endif() diff --git a/src/bin_gie.cmake b/src/bin_gie.cmake index a26ead3e18..6ad7d4ab40 100644 --- a/src/bin_gie.cmake +++ b/src/bin_gie.cmake @@ -11,8 +11,10 @@ add_executable(gie ${GIE_SRC} ${GIE_INCLUDE}) target_link_libraries(gie PRIVATE ${PROJ_LIBRARIES}) target_compile_options(gie PRIVATE ${PROJ_CXX_WARN_FLAGS}) -install(TARGETS gie - DESTINATION ${BINDIR}) +if(BUILD_GIE) + install(TARGETS gie + DESTINATION ${BINDIR}) +endif() if(MSVC AND BUILD_SHARED_LIBS) target_compile_definitions(gie PRIVATE PROJ_MSVC_DLL_IMPORT=1) From a2226fc4f99cdc892fc08ce9f7123ddd2ec60aa4 Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Mon, 11 Oct 2021 10:06:26 +1300 Subject: [PATCH 2/2] Update src/CMakeLists.txt Co-authored-by: Even Rouault --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 51c31ab921..4533e82223 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -70,7 +70,7 @@ if(BUILD_PROJINFO) endif() # Always build gie if testing is requested -if(BUILD_TESTING) +if(BUILD_GIE OR BUILD_TESTING) include(bin_gie.cmake) set(BIN_TARGETS ${BIN_TARGETS} gie) endif()