diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/opentrack-boilerplate.cmake | 2 | ||||
| -rw-r--r-- | cmake/opentrack-pkg-config.cmake | 16 | ||||
| -rw-r--r-- | cmake/opentrack-version.cmake | 2 |
3 files changed, 6 insertions, 14 deletions
diff --git a/cmake/opentrack-boilerplate.cmake b/cmake/opentrack-boilerplate.cmake index d86dde11..683f63a4 100644 --- a/cmake/opentrack-boilerplate.cmake +++ b/cmake/opentrack-boilerplate.cmake @@ -217,7 +217,7 @@ function(otr_module n_) header-hygiene ) foreach(k ${opts}) - set_property(TARGET "${n}" APPEND_STRING PROPERTY COMPILE_FLAGS "-Wno-${k} ") + target_compile_options(${n} PRIVATE "-Wno-${k}") endforeach() endif() diff --git a/cmake/opentrack-pkg-config.cmake b/cmake/opentrack-pkg-config.cmake index 7d70070e..5b84cf40 100644 --- a/cmake/opentrack-pkg-config.cmake +++ b/cmake/opentrack-pkg-config.cmake @@ -2,26 +2,18 @@ include_guard(GLOBAL) include(FindPkgConfig) function(otr_pkgconfig target) - set(cflags "") - set(includes "") - set(ldflags "") - set(libs "") foreach(i ${ARGN}) set(k pkg-config_${i}) pkg_check_modules(${k} QUIET ${i}) if(${${k}_FOUND}) - set(cflags "${cflags} ${${k}_CFLAGS} ") - set(includes ${includes} ${${k}_INCLUDE_DIRS} ${${k}_INCLUDEDIR}) - set(ldflags "${ldflags} ${${k}_LDFLAGS} ") - set(libs ${libs} ${${k}_LIBRARIES}) + target_compile_options(${target} PRIVATE "${${k}_CFLAGS}") + target_link_options(${target} PRIVATE ${${k}_LDFLAGS}) + target_include_directories(${target} SYSTEM PRIVATE ${${k}_INCLUDE_DIRS} ${${k}_INCLUDEDIR}) + target_link_libraries(${target} ${${k}_LIBRARIES}) else() message(FATAL_ERROR "Can't find '${i}'. Please install development files for this package.") endif() endforeach() - set_property(TARGET ${target} APPEND_STRING PROPERTY COMPILE_FLAGS "${cflags} ") - target_include_directories(${target} SYSTEM PRIVATE ${includes}) - set_property(TARGET ${target} APPEND_STRING PROPERTY LINK_FLAGS "${ldflags} ") - target_link_libraries(${target} ${libs}) endfunction() diff --git a/cmake/opentrack-version.cmake b/cmake/opentrack-version.cmake index ca6c70f6..0ff516f2 100644 --- a/cmake/opentrack-version.cmake +++ b/cmake/opentrack-version.cmake @@ -32,5 +32,5 @@ endif() add_library(opentrack-version STATIC "${file}") if(NOT MSVC) - set_property(TARGET opentrack-version APPEND_STRING PROPERTY COMPILE_FLAGS "-fno-lto ") + target_compile_options(opentrack-version PRIVATE -fno-lto) endif() |