Remove GLSLANG_BUILD_PIC flag
On closer inspection, it appears that nearly all the targets use the `POSITION_INDEPENDENT_CODE` target option anyway. Simplify all this away by always being PIC.
This commit is contained in:
parent
948dc034c5
commit
3604be156c
2 changed files with 2 additions and 14 deletions
|
|
@ -107,14 +107,6 @@ if(USE_CCACHE)
|
|||
endif(CCACHE_FOUND)
|
||||
endif()
|
||||
|
||||
# If projects are statically importing glslang targets into a shared library
|
||||
# then they'll likely need to build with -fPIC. This can be enabled by setting
|
||||
# GLSLANG_BUILD_PIC to 1 before calling add_subdirectory() to import glslang.
|
||||
# Note: -fPIC is automatically used when BUILD_SHARED_LIBS is enabled.
|
||||
if(NOT DEFINED GLSLANG_BUILD_PIC)
|
||||
option(GLSLANG_BUILD_PIC "Compile glslang with -fPIC" OFF)
|
||||
endif()
|
||||
|
||||
# Precompiled header macro. Parameters are source file list and filename for pch cpp file.
|
||||
macro(glslang_pch SRCS PCHCPP)
|
||||
if(MSVC AND CMAKE_GENERATOR MATCHES "^Visual Studio" AND NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" AND ENABLE_PCH)
|
||||
|
|
@ -160,9 +152,6 @@ if(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
|
|||
add_compile_options(-Wall -Wmaybe-uninitialized -Wuninitialized -Wunused -Wunused-local-typedefs
|
||||
-Wunused-parameter -Wunused-value -Wunused-variable -Wunused-but-set-parameter -Wunused-but-set-variable -fno-exceptions)
|
||||
add_compile_options(-Wno-reorder) # disable this from -Wall, since it happens all over.
|
||||
if(BUILD_SHARED_LIBS OR GLSLANG_BUILD_PIC)
|
||||
add_compile_options(-fPIC)
|
||||
endif()
|
||||
if(NOT ENABLE_RTTI)
|
||||
add_compile_options(-fno-rtti)
|
||||
endif()
|
||||
|
|
@ -183,9 +172,6 @@ elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" AND NOT MSVC)
|
|||
add_compile_options(-Wall -Wuninitialized -Wunused -Wunused-local-typedefs
|
||||
-Wunused-parameter -Wunused-value -Wunused-variable)
|
||||
add_compile_options(-Wno-reorder) # disable this from -Wall, since it happens all over.
|
||||
if(BUILD_SHARED_LIBS OR GLSLANG_BUILD_PIC)
|
||||
add_compile_options(-fPIC)
|
||||
endif()
|
||||
if(NOT ENABLE_RTTI)
|
||||
add_compile_options(-fno-rtti)
|
||||
endif()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue