mirror of
https://github.com/KhronosGroup/glslang
synced 2024-11-12 21:20:06 +00:00
Fix CMake scripts: The set_property script can be used to set only a single property, so now setting the POSITION_INDEPENDENT_CODE property correctly.
This commit is contained in:
parent
eb5f12d1ca
commit
6206091e63
@ -1,7 +1,8 @@
|
|||||||
set(SOURCES InitializeDll.cpp InitializeDll.h)
|
set(SOURCES InitializeDll.cpp InitializeDll.h)
|
||||||
|
|
||||||
add_library(OGLCompiler STATIC ${SOURCES})
|
add_library(OGLCompiler STATIC ${SOURCES})
|
||||||
set_property(TARGET OGLCompiler PROPERTY FOLDER glslang POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET OGLCompiler PROPERTY FOLDER glslang)
|
||||||
|
set_property(TARGET OGLCompiler PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
source_group("Source" FILES ${SOURCES})
|
source_group("Source" FILES ${SOURCES})
|
||||||
|
@ -40,11 +40,13 @@ if(ENABLE_NV_EXTENSIONS)
|
|||||||
endif(ENABLE_NV_EXTENSIONS)
|
endif(ENABLE_NV_EXTENSIONS)
|
||||||
|
|
||||||
add_library(SPIRV STATIC ${SOURCES} ${HEADERS})
|
add_library(SPIRV STATIC ${SOURCES} ${HEADERS})
|
||||||
set_property(TARGET SPIRV PROPERTY FOLDER glslang POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET SPIRV PROPERTY FOLDER glslang)
|
||||||
|
set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
target_link_libraries(SPIRV glslang)
|
target_link_libraries(SPIRV glslang)
|
||||||
|
|
||||||
add_library(SPVRemapper STATIC ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
|
add_library(SPVRemapper STATIC ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
|
||||||
set_property(TARGET SPVRemapper PROPERTY FOLDER glslang POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET SPVRemapper PROPERTY FOLDER glslang)
|
||||||
|
set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
source_group("Source" FILES ${SOURCES} ${HEADERS})
|
source_group("Source" FILES ${SOURCES} ${HEADERS})
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
add_library(glslang-default-resource-limits
|
add_library(glslang-default-resource-limits
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp)
|
${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp)
|
||||||
set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang)
|
||||||
|
set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
|
|
||||||
target_include_directories(glslang-default-resource-limits
|
target_include_directories(glslang-default-resource-limits
|
||||||
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
|
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
|
@ -79,7 +79,8 @@ set(HEADERS
|
|||||||
# set(BISON_GLSLParser_OUTPUT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp)
|
# set(BISON_GLSLParser_OUTPUT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp)
|
||||||
|
|
||||||
add_library(glslang STATIC ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
|
add_library(glslang STATIC ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
|
||||||
set_property(TARGET glslang PROPERTY FOLDER glslang POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET glslang PROPERTY FOLDER glslang)
|
||||||
|
set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
target_link_libraries(glslang OGLCompiler OSDependent)
|
target_link_libraries(glslang OGLCompiler OSDependent)
|
||||||
if(ENABLE_HLSL)
|
if(ENABLE_HLSL)
|
||||||
target_link_libraries(glslang HLSL)
|
target_link_libraries(glslang HLSL)
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
add_library(OSDependent STATIC ossource.cpp ../osinclude.h)
|
add_library(OSDependent STATIC ossource.cpp ../osinclude.h)
|
||||||
set_property(TARGET OSDependent PROPERTY FOLDER glslang POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET OSDependent PROPERTY FOLDER glslang)
|
||||||
|
set_property(TARGET OSDependent PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
|
|
||||||
install(TARGETS OSDependent
|
install(TARGETS OSDependent
|
||||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
set(SOURCES ossource.cpp ../osinclude.h)
|
set(SOURCES ossource.cpp ../osinclude.h)
|
||||||
|
|
||||||
add_library(OSDependent STATIC ${SOURCES})
|
add_library(OSDependent STATIC ${SOURCES})
|
||||||
set_property(TARGET OSDependent PROPERTY FOLDER glslang POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET OSDependent PROPERTY FOLDER glslang)
|
||||||
|
set_property(TARGET OSDependent PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
|
|
||||||
# MinGW GCC complains about function pointer casts to void*.
|
# MinGW GCC complains about function pointer casts to void*.
|
||||||
# Turn that off with -fpermissive.
|
# Turn that off with -fpermissive.
|
||||||
|
@ -18,7 +18,8 @@ set(HEADERS
|
|||||||
hlslParseables.h)
|
hlslParseables.h)
|
||||||
|
|
||||||
add_library(HLSL STATIC ${SOURCES} ${HEADERS})
|
add_library(HLSL STATIC ${SOURCES} ${HEADERS})
|
||||||
set_property(TARGET HLSL PROPERTY FOLDER hlsl POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET HLSL PROPERTY FOLDER hlsl)
|
||||||
|
set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
source_group("Source" FILES ${SOURCES} ${HEADERS})
|
source_group("Source" FILES ${SOURCES} ${HEADERS})
|
||||||
|
Loading…
Reference in New Issue
Block a user