Bladeren bron

Fix installation of resource limits headers

Fixes #3150
Greg Fischer 2 jaren geleden
bovenliggende
commit
aae2a7ae08
2 gewijzigde bestanden met toevoegingen van 3 en 2 verwijderingen
  1. 1 1
      CMakeLists.txt
  2. 2 1
      glslang/CMakeLists.txt

+ 1 - 1
CMakeLists.txt

@@ -233,7 +233,7 @@ if(${CMAKE_VERSION} VERSION_LESS 3.1)
     # remove this block once CMake >=3.1 has fixated in the ecosystem
     # remove this block once CMake >=3.1 has fixated in the ecosystem
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 else()
 else()
-    set(CMAKE_CXX_STANDARD 11)
+    set(CMAKE_CXX_STANDARD 17)
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
     set(CMAKE_CXX_EXTENSIONS OFF)
     set(CMAKE_CXX_EXTENSIONS OFF)
 endif()
 endif()

+ 2 - 1
glslang/CMakeLists.txt

@@ -250,7 +250,8 @@ if(ENABLE_GLSLANG_INSTALL)
 
 
     set(ALL_HEADERS
     set(ALL_HEADERS
         ${GLSLANG_HEADERS}
         ${GLSLANG_HEADERS}
-        ${MACHINEINDEPENDENT_HEADERS})
+        ${MACHINEINDEPENDENT_HEADERS}
+        ${RESOURCELIMITS_HEADERS})
 
 
     foreach(file ${ALL_HEADERS})
     foreach(file ${ALL_HEADERS})
         get_filename_component(dir ${file} DIRECTORY)
         get_filename_component(dir ${file} DIRECTORY)