--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -8,7 +8,7 @@
 
 set(commands PTtiff2psd PTtiffdump PTcrop PTblender
     PTroller PTuncrop PToptimizer PTmender PTinfo PTmasker)
-if (HAVE_JAVA)
+if (SUPPORT_JAVA_PROGRAMS)
   # this one depends on java (uses writeProject() from ptpicker)
   list(APPEND commands PTAInterpolate)
 endif()
@@ -20,7 +20,7 @@
   list(APPEND extra_commands ${exe_name})
   add_executable(${exe_name} ${source_name})
   target_link_libraries(${exe_name} ${_pano_target} ${_common_libs})
-  install(TARGETS ${exe_name} DESTINATION bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
+  install(TARGETS ${exe_name} DESTINATION bin COMPONENT tools CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
 endmacro()
 
 if(WIN32)