Define variable to skip installation

If this is used as a static library in another project, this does not
need to be installed, and otherwise will just clutter the application's install.
To use, define SKIP_SPIRV_TOOLS_INSTALL which internally defines
ENABLE_SPIRV_TOOLS_INSTALL to control installation.

Also include GNUInstallDirs to get standard output 'lib' directory which is sometimes 'lib64' and not 'lib'

CMakeLists.txt

@@ -25,6 +25,8 @@ project(spirv-tools)
 enable_testing()
 set(SPIRV_TOOLS "SPIRV-Tools")
 
+include(GNUInstallDirs)
+
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
@@ -48,6 +50,11 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
   set(CMAKE_BUILD_TYPE "Debug")
 endif()
 
+option(SKIP_SPIRV_TOOLS_INSTALL "Skip installation" ${SKIP_SPIRV_TOOLS_INSTALL})
+if(NOT ${SKIP_SPIRV_TOOLS_INSTALL})
+  set(ENABLE_SPIRV_TOOLS_INSTALL ON)
+endif()
+ 
 option(SPIRV_WERROR "Enable error on warning" ON)
 if(("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang"))
   set(COMPILER_IS_LIKE_GNU TRUE)
@@ -165,13 +172,15 @@ add_subdirectory(tools)
 add_subdirectory(test)
 add_subdirectory(examples)
 
-install(
-  FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/spirv-tools/libspirv.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/spirv-tools/libspirv.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/spirv-tools/optimizer.hpp
-  DESTINATION
-    include/spirv-tools/)
+if(ENABLE_SPIRV_TOOLS_INSTALL)
+  install(
+    FILES
+      ${CMAKE_CURRENT_SOURCE_DIR}/include/spirv-tools/libspirv.h
+      ${CMAKE_CURRENT_SOURCE_DIR}/include/spirv-tools/libspirv.hpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/include/spirv-tools/optimizer.hpp
+    DESTINATION
+      ${CMAKE_INSTALL_INCLUDEDIR}/spirv-tools/)
+endif(ENABLE_SPIRV_TOOLS_INSTALL)
 
 add_test(NAME spirv-tools-copyrights
          COMMAND ${PYTHON_EXECUTABLE} utils/check_copyright.py

source/CMakeLists.txt

@@ -289,7 +289,9 @@ target_include_directories(${SPIRV_TOOLS}
   )
 set_property(TARGET ${SPIRV_TOOLS} PROPERTY FOLDER "SPIRV-Tools libraries")
 
-install(TARGETS ${SPIRV_TOOLS}
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib)
+if(ENABLE_SPIRV_TOOLS_INSTALL)
+  install(TARGETS ${SPIRV_TOOLS}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+endif(ENABLE_SPIRV_TOOLS_INSTALL)

source/comp/CMakeLists.txt

@@ -26,7 +26,9 @@ target_link_libraries(SPIRV-Tools-comp
 
 set_property(TARGET SPIRV-Tools-comp PROPERTY FOLDER "SPIRV-Tools libraries")
 
-install(TARGETS SPIRV-Tools-comp
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib)
+if(ENABLE_SPIRV_TOOLS_INSTALL)
+  install(TARGETS SPIRV-Tools-comp
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+endif(ENABLE_SPIRV_TOOLS_INSTALL)

source/opt/CMakeLists.txt

@@ -82,7 +82,10 @@ target_link_libraries(SPIRV-Tools-opt
 
 set_property(TARGET SPIRV-Tools-opt PROPERTY FOLDER "SPIRV-Tools libraries")
 
-install(TARGETS SPIRV-Tools-opt
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib)
+if(ENABLE_SPIRV_TOOLS_INSTALL)
+  install(TARGETS SPIRV-Tools-opt
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+endif(ENABLE_SPIRV_TOOLS_INSTALL)
+    

tools/CMakeLists.txt

@@ -62,8 +62,10 @@ if (NOT ${SPIRV_SKIP_EXECUTABLES})
 
   set(SPIRV_INSTALL_TARGETS spirv-as spirv-dis spirv-val spirv-opt spirv-stats spirv-cfg
 	                    spirv-markv)
-  install(TARGETS ${SPIRV_INSTALL_TARGETS}
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+  if(ENABLE_SPIRV_TOOLS_INSTALL)
+    install(TARGETS ${SPIRV_INSTALL_TARGETS}
+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+  endif(ENABLE_SPIRV_TOOLS_INSTALL)
 endif()

tools/emacs/CMakeLists.txt

@@ -40,7 +40,9 @@ option(SPIRV_TOOLS_INSTALL_EMACS_HELPERS
   ${SPIRV_TOOLS_INSTALL_EMACS_HELPERS})
 if (${SPIRV_TOOLS_INSTALL_EMACS_HELPERS})
   if(EXISTS /etc/emacs/site-start.d)
-    install(FILES 50spirv-tools.el DESTINATION /etc/emacs/site-start.d)
+    if(ENABLE_SPIRV_TOOLS_INSTALL)
+      install(FILES 50spirv-tools.el DESTINATION /etc/emacs/site-start.d)
+    endif(ENABLE_SPIRV_TOOLS_INSTALL)
   endif()
 endif()
 

tools/lesspipe/CMakeLists.txt

@@ -23,4 +23,6 @@
 # permissions.
 # We have a .sh extension because Windows users often configure
 # executable settings via filename extension.
-install(PROGRAMS spirv-lesspipe.sh DESTINATION bin)
+if(ENABLE_SPIRV_TOOLS_INSTALL)
+  install(PROGRAMS spirv-lesspipe.sh DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif(ENABLE_SPIRV_TOOLS_INSTALL)