From 6c5bf73141dc711187a21904d9c1f9ff1de69834 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Sat, 29 Dec 2018 02:02:52 -0700 Subject: [PATCH] CMake: Don't build pview/downloadertools when BUILD_PANDATOOL=OFF --- panda/src/downloadertools/CMakeLists.txt | 6 +++++ panda/src/testbed/CMakeLists.txt | 29 +++++------------------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/panda/src/downloadertools/CMakeLists.txt b/panda/src/downloadertools/CMakeLists.txt index aae9cf85fa..bd3d3124ed 100644 --- a/panda/src/downloadertools/CMakeLists.txt +++ b/panda/src/downloadertools/CMakeLists.txt @@ -1,3 +1,9 @@ +if(NOT BUILD_PANDATOOL) + # It's safe to say, if the user doesn't want pandatool, they don't want these + # tools either. + return() +endif() + if(HAVE_OPENSSL) add_executable(apply_patch apply_patch.cxx) target_link_libraries(apply_patch panda) diff --git a/panda/src/testbed/CMakeLists.txt b/panda/src/testbed/CMakeLists.txt index 4872df41ad..e44ce3a2a5 100644 --- a/panda/src/testbed/CMakeLists.txt +++ b/panda/src/testbed/CMakeLists.txt @@ -1,26 +1,9 @@ +if(NOT BUILD_PANDATOOL) + # It's safe to say, if the user doesn't want pandatool, they don't want pview + # either. + return() +endif() + add_executable(pview pview.cxx) target_link_libraries(pview p3framework p3pystub) install(TARGETS pview EXPORT Tools COMPONENT Tools DESTINATION bin) - -#begin test_bin_target - #define TARGET pgrid - - #define SOURCES \ -# pgrid.cxx - #define UNIX_SYS_LIBS m -#end test_bin_target - -#begin test_bin_target - #define TARGET test_lod - #define SOURCES test_lod.cxx -#end test_bin_target - -#begin test_bin_target - #define TARGET test_texmem - #define SOURCES test_texmem.cxx -#end test_bin_target - -#begin test_bin_target - #define TARGET test_map - #define SOURCES test_map.cxx -#end test_bin_target