Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert <krzmbrzl@gmail.com>2020-10-13 16:18:39 +0300
committerRobert <krzmbrzl@gmail.com>2020-10-13 17:25:52 +0300
commit5cf9dde08be6b64b7a43b5b016c4ff2604f19ad1 (patch)
tree3b3632ee73fae49fe41eb3cb9dcb41a333d7aba6 /g15helper
parent30c51665a66f64536fabacc8f9884ba7fd1ca108 (diff)
BUILD(cmake): Fix use of generator expression
The changed files used a generator expression in an if-statement, which is invalid as these generator expressions are not evaluated during the initial configuration stage (at which point the if-statement is evaluated). This commit changes the use of the generator-expression in such a way that it will actually do what it was meant to. Note that this commit also enables position independent code for all platforms and all build-types instead of only for debug builds on unix systems. This was the preferred choice instead of porting the -fPIE compiler option to use proper generator expressions as the presence of these options caused linking errors with Celt/Opus.
Diffstat (limited to 'g15helper')
-rw-r--r--g15helper/CMakeLists.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/g15helper/CMakeLists.txt b/g15helper/CMakeLists.txt
index 78dbabec8..89d70cb4b 100644
--- a/g15helper/CMakeLists.txt
+++ b/g15helper/CMakeLists.txt
@@ -25,9 +25,7 @@ set_target_properties(g15-helper
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
)
-if($<CONFIG:Debug>)
- target_compile_definitions(g15-helper PRIVATE "USE_LOGFILE")
-endif()
+target_compile_definitions(g15-helper PRIVATE $<$<CONFIG:Debug>:USE_LOGFILE>)
if(g15-emulator)
find_pkg(Qt5 COMPONENTS Core Gui Widgets REQUIRED)