From 2e06b27fcf600b5f13507179a3fb634a39a67c61 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 16 Dec 2022 12:24:23 +0100
Subject: [PATCH] Fix CMake generator expression

---
 .../volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt  | 4 ++--
 .../volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt
index 2af052479..8bcb9adce 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt
@@ -73,7 +73,7 @@ endif()
 
 if(UNIX)
     target_compile_definitions(volk_gnsssdr_profile
-        PUBLIC $<$<CONFIG:Release>:_FORTIFY_SOURCE=2>$<$<CONFIG:RelWithDebInfo>:_FORTIFY_SOURCE=2>$<$<ENABLE_PACKAGING>:_FORTIFY_SOURCE=2>
+        PUBLIC $<$<CONFIG:Release>:_FORTIFY_SOURCE=2>$<$<CONFIG:RelWithDebInfo>:_FORTIFY_SOURCE=2>$<$<BOOL:${ENABLE_PACKAGING}>:_FORTIFY_SOURCE=2> 
     )
 endif()
 
@@ -102,7 +102,7 @@ endif()
 
 if(UNIX)
     target_compile_definitions(volk_gnsssdr-config-info
-        PUBLIC $<$<CONFIG:Release>:_FORTIFY_SOURCE=2>$<$<CONFIG:RelWithDebInfo>:_FORTIFY_SOURCE=2>$<$<ENABLE_PACKAGING>:_FORTIFY_SOURCE=2>
+        PUBLIC $<$<CONFIG:Release>:_FORTIFY_SOURCE=2>$<$<CONFIG:RelWithDebInfo>:_FORTIFY_SOURCE=2>$<$<BOOL:${ENABLE_PACKAGING}>:_FORTIFY_SOURCE=2> 
     )
 endif()
 
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
index 196a6fcaa..fd011e9b1 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
@@ -590,11 +590,11 @@ if(NOT (ENABLE_STATIC_LIBS AND (CMAKE_GENERATOR STREQUAL Xcode)))
         PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
         PUBLIC $<INSTALL_INTERFACE:include>
     )
-    if(UNIX)
+    #if(UNIX)
         target_compile_definitions(volk_gnsssdr
-            PUBLIC $<$<CONFIG:Release>:_FORTIFY_SOURCE=2>$<$<CONFIG:RelWithDebInfo>:_FORTIFY_SOURCE=2>$<$<ENABLE_PACKAGING>:_FORTIFY_SOURCE=2>
+            PUBLIC $<$<CONFIG:Release>:_FORTIFY_SOURCE=2>$<$<CONFIG:RelWithDebInfo>:_FORTIFY_SOURCE=2>$<$<BOOL:${ENABLE_PACKAGING}>:_FORTIFY_SOURCE=2>   
         )
-    endif()
+    #endif()
     if(USE_CPU_FEATURES)
         if(CPUFEATURES_FOUND)
             target_include_directories(volk_gnsssdr
@@ -667,7 +667,7 @@ if(ENABLE_STATIC_LIBS)
     )
     if(UNIX)
         target_compile_definitions(volk_gnsssdr_static
-            PUBLIC $<$<CONFIG:Release>:_FORTIFY_SOURCE=2>$<$<CONFIG:RelWithDebInfo>:_FORTIFY_SOURCE=2>$<$<ENABLE_PACKAGING>:_FORTIFY_SOURCE=2>
+            PUBLIC $<$<CONFIG:Release>:_FORTIFY_SOURCE=2>$<$<CONFIG:RelWithDebInfo>:_FORTIFY_SOURCE=2>$<$<BOOL:${ENABLE_PACKAGING}>:_FORTIFY_SOURCE=2>
         )
     endif()
     set_target_properties(volk_gnsssdr_static PROPERTIES OUTPUT_NAME volk_gnsssdr)