瀏覽代碼

CMake: Don't build pview/downloadertools when BUILD_PANDATOOL=OFF

Sam Edwards 7 年之前
父節點
當前提交
6c5bf73141
共有 2 個文件被更改,包括 12 次插入23 次删除
  1. 6 0
      panda/src/downloadertools/CMakeLists.txt
  2. 6 23
      panda/src/testbed/CMakeLists.txt

+ 6 - 0
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)
 if(HAVE_OPENSSL)
   add_executable(apply_patch apply_patch.cxx)
   add_executable(apply_patch apply_patch.cxx)
   target_link_libraries(apply_patch panda)
   target_link_libraries(apply_patch panda)

+ 6 - 23
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)
 add_executable(pview pview.cxx)
 target_link_libraries(pview p3framework p3pystub)
 target_link_libraries(pview p3framework p3pystub)
 install(TARGETS pview EXPORT Tools COMPONENT Tools DESTINATION bin)
 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