Merge pull request KhronosGroup#1 from jhs67/master

install cmake config files
mean-ui-thread · Jun 15, 2018 · 3917132 · 3917132
2 parents ba018e6 + f8a4917
commit 3917132
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -110,6 +110,8 @@ else()
     add_definitions(-DENABLE_OPT=0)
 endif()
 
+set(targets_export_name "${PROJECT_NAME}-targets")
+
 add_subdirectory(glslang)
 add_subdirectory(OGLCompilersDLL)
 if(ENABLE_GLSLANG_BINARIES)
@@ -120,3 +122,16 @@ if(ENABLE_HLSL)
     add_subdirectory(hlsl)
 endif(ENABLE_HLSL)
 add_subdirectory(gtests)
+
+set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
+set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+set(version_config "${generated_dir}/${PROJECT_NAME}-config-version.cmake")
+set(project_config "${generated_dir}/${PROJECT_NAME}-config.cmake")
+set(namespace "${PROJECT_NAME}::")
+set(project_version "7.7.2767")
+
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file("${version_config}" VERSION "${project_version}" COMPATIBILITY SameMajorVersion)
+configure_package_config_file("cmake/config.cmake.in" "${project_config}" INSTALL_DESTINATION "${config_install_dir}")
+install(FILES "${project_config}" "${version_config}" DESTINATION "${config_install_dir}")
+install(EXPORT "${targets_export_name}" NAMESPACE "${namespace}" DESTINATION "${config_install_dir}")
diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
@@ -10,5 +10,6 @@ endif(WIN32)
 
 if(ENABLE_GLSLANG_INSTALL)
     install(TARGETS OGLCompiler
+            EXPORT ${targets_export_name}
             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif(ENABLE_GLSLANG_INSTALL)
diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
@@ -43,7 +43,7 @@ endif(ENABLE_NV_EXTENSIONS)
 add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
 set_property(TARGET SPIRV PROPERTY FOLDER glslang)
 set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
-target_include_directories(SPIRV PUBLIC ..)
+target_include_directories(SPIRV PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/..>)
 
 add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
 set_property(TARGET SPVRemapper PROPERTY FOLDER glslang)
@@ -72,11 +72,15 @@ endif(WIN32)
 if(ENABLE_GLSLANG_INSTALL)
     if(BUILD_SHARED_LIBS)
         install(TARGETS SPIRV SPVRemapper
+                EXPORT ${targets_export_name}
                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
     else()
         install(TARGETS SPIRV SPVRemapper
-                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+                EXPORT ${targets_export_name}
+                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
     endif()
 
     install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SPIRV/)

diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
@@ -40,9 +40,11 @@ endif(WIN32)
 
 if(ENABLE_GLSLANG_INSTALL)
     install(TARGETS glslangValidator
+            EXPORT ${targets_export_name}
             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
     install(TARGETS spirv-remap
+            EXPORT ${targets_export_name}
             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
     if(BUILD_SHARED_LIBS)

diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in
@@ -0,0 +1,4 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
+check_required_components("@PROJECT_NAME@")
diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
@@ -84,7 +84,7 @@ add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${H
 set_property(TARGET glslang PROPERTY FOLDER glslang)
 set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_link_libraries(glslang OGLCompiler OSDependent)
-target_include_directories(glslang PUBLIC ..)
+target_include_directories(glslang PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/..>)
 
 if(WIN32 AND BUILD_SHARED_LIBS)
     set_target_properties(glslang PROPERTIES PREFIX "")
@@ -105,11 +105,16 @@ endif(WIN32)
 if(ENABLE_GLSLANG_INSTALL)
     if(BUILD_SHARED_LIBS)
         install(TARGETS glslang
+                EXPORT ${targets_export_name}
                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
     else()
         install(TARGETS glslang
-                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+                EXPORT ${targets_export_name}
+                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
     endif()
 endif(ENABLE_GLSLANG_INSTALL)
 

diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt
@@ -4,5 +4,6 @@ set_property(TARGET OSDependent PROPERTY POSITION_INDEPENDENT_CODE ON)
 
 if(ENABLE_GLSLANG_INSTALL)
     install(TARGETS OSDependent
+            EXPORT ${targets_export_name}
             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif(ENABLE_GLSLANG_INSTALL)
diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt
@@ -16,5 +16,6 @@ endif(WIN32)
 
 if(ENABLE_GLSLANG_INSTALL)
     install(TARGETS OSDependent
+            EXPORT ${targets_export_name}
             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif(ENABLE_GLSLANG_INSTALL)
diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt
@@ -30,6 +30,7 @@ if(BUILD_TESTING)
         glslang_set_link_args(glslangtests)
         if(ENABLE_GLSLANG_INSTALL)
             install(TARGETS glslangtests
+                    EXPORT ${targets_export_name}
                     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
         endif(ENABLE_GLSLANG_INSTALL)
 

diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt
@@ -32,10 +32,14 @@ endif(WIN32)
 if(ENABLE_GLSLANG_INSTALL)
     if(BUILD_SHARED_LIBS)
         install(TARGETS HLSL
+                EXPORT ${targets_export_name}
                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
     else()
         install(TARGETS HLSL
-                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+                EXPORT ${targets_export_name}
+                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
     endif()
 endif(ENABLE_GLSLANG_INSTALL)