AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1273 from orbea/cmake

Browse Source 
Add GNUInstallDirs + fixes for the pkg-config file
This commit is contained in:
Hans-Kristian Arntzen 2020-02-03 10:47:55 +01:00 committed by GitHub
commit cb0aca91ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -17,6 +17,8 @@ set(CMAKE_CXX_STANDARD 11)
project(SPIRV-Cross LANGUAGES CXX C) project(SPIRV-Cross LANGUAGES CXX C)
enable_testing() enable_testing()
include(GNUInstallDirs)
option(SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS "Instead of throwing exceptions assert" OFF) option(SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS "Instead of throwing exceptions assert" OFF)
option(SPIRV_CROSS_SHARED "Build the C API as a single shared library." OFF) option(SPIRV_CROSS_SHARED "Build the C API as a single shared library." OFF)
option(SPIRV_CROSS_STATIC "Build the C and C++ API as static libraries." ON) option(SPIRV_CROSS_STATIC "Build the C and C++ API as static libraries." ON)
@ -171,12 +173,12 @@ macro(spirv_cross_add_library name config_name library_type)
if (NOT SPIRV_CROSS_SKIP_INSTALL) if (NOT SPIRV_CROSS_SKIP_INSTALL)
install(TARGETS ${name} install(TARGETS ${name}
EXPORT ${config_name}Config EXPORT ${config_name}Config
RUNTIME DESTINATION bin RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION lib ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER DESTINATION include/spirv_cross) PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/spirv_cross)
install(FILES ${hdrs} DESTINATION include/spirv_cross) install(FILES ${hdrs} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/spirv_cross)
install(EXPORT ${config_name}Config DESTINATION share/${config_name}/cmake) install(EXPORT ${config_name}Config DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${config_name}/cmake)
export(TARGETS ${name} FILE ${config_name}Config.cmake) export(TARGETS ${name} FILE ${config_name}Config.cmake)
endif() endif()
endmacro() endmacro()
@ -320,14 +322,12 @@ set(spirv-cross-abi-patch 0)
if (SPIRV_CROSS_SHARED) if (SPIRV_CROSS_SHARED)
set(SPIRV_CROSS_VERSION ${spirv-cross-abi-major}.${spirv-cross-abi-minor}.${spirv-cross-abi-patch}) set(SPIRV_CROSS_VERSION ${spirv-cross-abi-major}.${spirv-cross-abi-minor}.${spirv-cross-abi-patch})
set(SPIRV_CROSS_INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib)
set(SPIRV_CROSS_INSTALL_INC_DIR ${CMAKE_INSTALL_PREFIX}/include/spirv_cross)
if (NOT SPIRV_CROSS_SKIP_INSTALL) if (NOT SPIRV_CROSS_SKIP_INSTALL)
configure_file( configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/pkg-config/spirv-cross-c-shared.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/pkg-config/spirv-cross-c-shared.pc.in
${CMAKE_CURRENT_BINARY_DIR}/spirv-cross-c-shared.pc @ONLY) ${CMAKE_CURRENT_BINARY_DIR}/spirv-cross-c-shared.pc @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/spirv-cross-c-shared.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pkgconfig) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/spirv-cross-c-shared.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
endif() endif()
spirv_cross_add_library(spirv-cross-c-shared spirv_cross_c_shared SHARED spirv_cross_add_library(spirv-cross-c-shared spirv_cross_c_shared SHARED
@ -427,7 +427,7 @@ if (SPIRV_CROSS_CLI)
target_compile_definitions(spirv-cross PRIVATE ${spirv-compiler-defines} HAVE_SPIRV_CROSS_GIT_VERSION) target_compile_definitions(spirv-cross PRIVATE ${spirv-compiler-defines} HAVE_SPIRV_CROSS_GIT_VERSION)
set_target_properties(spirv-cross PROPERTIES LINK_FLAGS "${spirv-cross-link-flags}") set_target_properties(spirv-cross PROPERTIES LINK_FLAGS "${spirv-cross-link-flags}")
if (NOT SPIRV_CROSS_SKIP_INSTALL) if (NOT SPIRV_CROSS_SKIP_INSTALL)
install(TARGETS spirv-cross RUNTIME DESTINATION bin) install(TARGETS spirv-cross RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif() endif()
target_link_libraries(spirv-cross PRIVATE target_link_libraries(spirv-cross PRIVATE
spirv-cross-glsl spirv-cross-glsl

8
pkg-config/spirv-cross-c-shared.pc.in
View File

@ -1,8 +1,8 @@
prefix=@CMAKE_INSTALL_PREFIX@ prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix}
libdir=@SPIRV_CROSS_INSTALL_LIB_DIR@ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
sharedlibdir=@SPIRV_CROSS_INSTALL_LIB_DIR@ sharedlibdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
includedir=@SPIRV_CROSS_INSTALL_INC_DIR@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/spirv_cross
Name: spirv-cross-c-shared Name: spirv-cross-c-shared
Description: C API for SPIRV-Cross Description: C API for SPIRV-Cross