Merge pull request #2326 from ben-clayton/always_pic
Remove GLSLANG_BUILD_PIC flag
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9041d8..3d66e2b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,14 +107,6 @@
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 @@
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 @@
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()
diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
index 98c8145..9fcf81c 100644
--- a/glslang/CMakeLists.txt
+++ b/glslang/CMakeLists.txt
@@ -50,6 +50,8 @@
add_library(GenericCodeGen STATIC
GenericCodeGen/CodeGen.cpp
GenericCodeGen/Link.cpp)
+set_property(TARGET GenericCodeGen PROPERTY POSITION_INDEPENDENT_CODE ON)
+set_property(TARGET GenericCodeGen PROPERTY FOLDER glslang)
################################################################################
# MachineIndependent
@@ -129,7 +131,8 @@
endif(ENABLE_HLSL)
add_library(MachineIndependent STATIC ${MACHINEINDEPENDENT_SOURCES} ${MACHINEINDEPENDENT_HEADERS})
-
+set_property(TARGET MachineIndependent PROPERTY POSITION_INDEPENDENT_CODE ON)
+set_property(TARGET MachineIndependent PROPERTY FOLDER glslang)
glslang_pch(SOURCES MachineIndependent/pch.cpp)
target_link_libraries(MachineIndependent PRIVATE OGLCompiler OSDependent GenericCodeGen)
