mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CMake: Use set_target_properties instead of set_property

Browse Source 
This makes the cmake code a bit cleaner and more consistent.
This commit is contained in:
Rémi Verschelde 2020-10-12 11:21:05 +02:00 committed by arcady-lunarg
parent 6f22e41e0d
commit 48a467b413
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SPIRV/CMakeLists.txt
View File

@ -71,9 +71,11 @@ set(SPVREMAP_HEADERS
doc.h) doc.h)
add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
set_target_properties(SPIRV PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}") set_target_properties(SPIRV PROPERTIES
set_property(TARGET SPIRV PROPERTY FOLDER glslang) FOLDER glslang
set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) POSITION_INDEPENDENT_CODE ON
VERSION "${GLSLANG_VERSION}"
SOVERSION "${GLSLANG_VERSION_MAJOR}")
target_include_directories(SPIRV PUBLIC target_include_directories(SPIRV PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
@ -82,9 +84,11 @@ glslang_add_build_info_dependency(SPIRV)
if (ENABLE_SPVREMAPPER) if (ENABLE_SPVREMAPPER)
add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
set_target_properties(SPVRemapper PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}") set_target_properties(SPVRemapper PROPERTIES
set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) FOLDER glslang
set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON) POSITION_INDEPENDENT_CODE ON
VERSION "${GLSLANG_VERSION}"
SOVERSION "${GLSLANG_VERSION_MAJOR}")
endif() endif()
if(WIN32 AND BUILD_SHARED_LIBS) if(WIN32 AND BUILD_SHARED_LIBS)

8
hlsl/CMakeLists.txt
View File

@ -38,9 +38,11 @@
# projects that referenced this target. # projects that referenced this target.
add_library(HLSL ${LIB_TYPE} "stub.cpp") add_library(HLSL ${LIB_TYPE} "stub.cpp")
set_property(TARGET HLSL PROPERTY FOLDER hlsl) set_target_properties(HLSL PROPERTIES
set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON) FOLDER hlsl
set_target_properties(HLSL PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}") POSITION_INDEPENDENT_CODE ON
VERSION "${GLSLANG_VERSION}"
SOVERSION "${GLSLANG_VERSION_MAJOR}")
if(WIN32 AND BUILD_SHARED_LIBS) if(WIN32 AND BUILD_SHARED_LIBS)
set_target_properties(HLSL PROPERTIES PREFIX "") set_target_properties(HLSL PROPERTIES PREFIX "")