diff options
| author | Martin Braun <martin.braun@ettus.com> | 2020-07-16 17:43:07 +0200 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2020-07-20 16:01:24 -0500 |
| commit | ba2a16139ac756fad8d478e97ff39075e175235b (patch) | |
| tree | f0fb7223e80be0fa9e4f43ce3abeb25fbe0f9b21 | |
| parent | 1d3866bef4e4677b95d3364b94880d7823d2530f (diff) | |
| download | uhd-ba2a16139ac756fad8d478e97ff39075e175235b.tar.gz uhd-ba2a16139ac756fad8d478e97ff39075e175235b.tar.bz2 uhd-ba2a16139ac756fad8d478e97ff39075e175235b.zip | |
cmakerc: Remove patch to CMakeRC.cmake (and move it one level up)
UHD's version of CMakeRC.cmake was patched from the upstream (see also
933eca1) to enable -fPIC for the RC targets. This can also be done
outside of said file, avoiding us having to carry a patched version of
CMakeRC, and using the vanilla upstream version instead.
| -rw-r--r-- | host/cmake/Modules/CMakeRC.cmake | 1 | ||||
| -rw-r--r-- | host/lib/rc/CMakeLists.txt | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/host/cmake/Modules/CMakeRC.cmake b/host/cmake/Modules/CMakeRC.cmake index d1e389b93..81a447c8e 100644 --- a/host/cmake/Modules/CMakeRC.cmake +++ b/host/cmake/Modules/CMakeRC.cmake @@ -499,7 +499,6 @@ function(cmrc_add_resource_library name) set_property(TARGET ${name} PROPERTY CMRC_NAMESPACE "${ARG_NAMESPACE}") target_link_libraries(${name} PUBLIC cmrc::base) set_property(TARGET ${name} PROPERTY CMRC_IS_RESOURCE_LIBRARY TRUE) - set_property(TARGET ${name} PROPERTY POSITION_INDEPENDENT_CODE ON) if(ARG_ALIAS) add_library("${ARG_ALIAS}" ALIAS ${name}) endif() diff --git a/host/lib/rc/CMakeLists.txt b/host/lib/rc/CMakeLists.txt index d2a01bffb..52b6693c0 100644 --- a/host/lib/rc/CMakeLists.txt +++ b/host/lib/rc/CMakeLists.txt @@ -10,3 +10,4 @@ cmrc_add_resource_library(uhd-resources NAMESPACE rc cal/test.cal ) +set_property(TARGET uhd-resources PROPERTY POSITION_INDEPENDENT_CODE ON) |