diff --git a/deps/file-updater/CMakeLists.txt b/deps/file-updater/CMakeLists.txt index d32462354..0b46b6644 100644 --- a/deps/file-updater/CMakeLists.txt +++ b/deps/file-updater/CMakeLists.txt @@ -22,12 +22,10 @@ add_library(file-updater STATIC target_include_directories(file-updater PUBLIC .) -if(NOT MSVC AND NOT MINGW) - target_compile_options(file-updater PRIVATE -fPIC) -endif() - target_link_libraries(file-updater ${LIBCURL_LIBRARIES} ${file-updater_PLATFORM_DEPS} libobs) -set_target_properties(file-updater PROPERTIES FOLDER "deps") +set_target_properties(file-updater PROPERTIES + FOLDER "deps" + POSITION_INDEPENDENT_CODE ON) diff --git a/deps/glad/CMakeLists.txt b/deps/glad/CMakeLists.txt index a98f4ff28..17ccb9a98 100644 --- a/deps/glad/CMakeLists.txt +++ b/deps/glad/CMakeLists.txt @@ -38,7 +38,8 @@ set_target_properties(glad PROPERTIES FOLDER "deps" OUTPUT_NAME obsglad VERSION "0" - SOVERSION "0") + SOVERSION "0" + POSITION_INDEPENDENT_CODE ON) target_include_directories(glad PUBLIC include ${glad_include_dirs}) @@ -48,9 +49,6 @@ target_compile_definitions(glad if(NOT MSVC) target_compile_options(glad PRIVATE -DPIC -fvisibility=hidden) - if(NOT MINGW) - target_compile_options(glad PRIVATE -fPIC) - endif() endif() if(NOT WIN32 AND NOT APPLE) diff --git a/deps/ipc-util/CMakeLists.txt b/deps/ipc-util/CMakeLists.txt index 3e2f19144..66f63a07e 100644 --- a/deps/ipc-util/CMakeLists.txt +++ b/deps/ipc-util/CMakeLists.txt @@ -29,7 +29,9 @@ endif() add_library(ipc-util STATIC ${ipc-util_SOURCES} ${ipc-util_HEADERS}) -set_target_properties(ipc-util PROPERTIES FOLDER "deps") +set_target_properties(ipc-util PROPERTIES + FOLDER "deps" + POSITION_INDEPENDENT_CODE ON) target_include_directories(ipc-util PUBLIC .) target_link_libraries(ipc-util) diff --git a/deps/libcaption/CMakeLists.txt b/deps/libcaption/CMakeLists.txt index 1a2001deb..e9975df2d 100644 --- a/deps/libcaption/CMakeLists.txt +++ b/deps/libcaption/CMakeLists.txt @@ -36,4 +36,6 @@ set(CAPTION_HEADERS ) add_library(caption STATIC ${CAPTION_SOURCES}) -set_target_properties(caption PROPERTIES FOLDER "deps") +set_target_properties(caption PROPERTIES + FOLDER "deps" + POSITION_INDEPENDENT_CODE ON) diff --git a/deps/libff/CMakeLists.txt b/deps/libff/CMakeLists.txt index e23bf1040..a7b75bc3b 100644 --- a/deps/libff/CMakeLists.txt +++ b/deps/libff/CMakeLists.txt @@ -50,16 +50,12 @@ endif(WIN32) add_library (libff STATIC ${libff_HEADERS} ${libff_SOURCES}) -set_target_properties(libff PROPERTIES FOLDER "deps") +set_target_properties(libff PROPERTIES + FOLDER "deps" + POSITION_INDEPENDENT_CODE ON) target_include_directories(libff PUBLIC .) -if(NOT MSVC) - if(NOT MINGW) - target_compile_options(libff PRIVATE -fPIC) - endif() -endif() - target_link_libraries (libff ${FFMPEG_LIBRARIES}) diff --git a/deps/media-playback/CMakeLists.txt b/deps/media-playback/CMakeLists.txt index 39d00150d..621c17a79 100644 --- a/deps/media-playback/CMakeLists.txt +++ b/deps/media-playback/CMakeLists.txt @@ -31,14 +31,9 @@ target_include_directories(media-playback PUBLIC . ) - -if(NOT MSVC) - if(NOT MINGW) - target_compile_options(media-playback PRIVATE -fPIC) - endif() -endif() - target_link_libraries(media-playback ${FFMPEG_LIBRARIES} ) -set_target_properties(media-playback PROPERTIES FOLDER "deps") +set_target_properties(media-playback PROPERTIES + FOLDER "deps" + POSITION_INDEPENDENT_CODE ON) diff --git a/plugins/obs-x264/CMakeLists.txt b/plugins/obs-x264/CMakeLists.txt index 2b918ba84..c9f75d979 100644 --- a/plugins/obs-x264/CMakeLists.txt +++ b/plugins/obs-x264/CMakeLists.txt @@ -14,7 +14,9 @@ add_library(obs-x264-util STATIC ${obs-x264-util_HEADERS} ${obs-x264-util_SOURCES}) target_link_libraries(obs-x264-util PRIVATE libobs) -set_target_properties(obs-x264-util PROPERTIES FOLDER "plugins") +set_target_properties(obs-x264-util PROPERTIES + FOLDER "plugins" + POSITION_INDEPENDENT_CODE ON) set(obs-x264_SOURCES obs-x264.c