From 08889f238b3e9c2543ddee67f61927047ac8733c Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Wed, 27 Apr 2022 16:18:51 +0200
Subject: [PATCH] Make use of CMAKE_CURRENT_SOURCE_DIR, improve maintainability

---
 src/core/libs/supl/CMakeLists.txt | 32 +++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/core/libs/supl/CMakeLists.txt b/src/core/libs/supl/CMakeLists.txt
index f1e230bfd..36b7261c7 100644
--- a/src/core/libs/supl/CMakeLists.txt
+++ b/src/core/libs/supl/CMakeLists.txt
@@ -4,17 +4,17 @@
 # SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es
 # SPDX-License-Identifier: BSD-3-Clause
 
-file(GLOB ASN_RRLP_SOURCES "${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp/*.c")
+file(GLOB ASN_RRLP_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/asn-rrlp/*.c")
 list(SORT ASN_RRLP_SOURCES)
-file(GLOB ASN_RRLP_HEADERS "${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp/*.h")
+file(GLOB ASN_RRLP_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/asn-rrlp/*.h")
 list(SORT ASN_RRLP_HEADERS)
-file(GLOB ASN_SUPL_SOURCES "${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl/*.c")
+file(GLOB ASN_SUPL_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/asn-supl/*.c")
 list(SORT ASN_SUPL_SOURCES)
-file(GLOB ASN_SUPL_HEADERS "${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl/*.h")
+file(GLOB ASN_SUPL_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/asn-supl/*.h")
 list(SORT ASN_SUPL_HEADERS)
-file(GLOB ASN_TYPES_SOURCES "${CMAKE_SOURCE_DIR}/src/core/libs/supl/types/*.c")
+file(GLOB ASN_TYPES_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/types/*.c")
 list(SORT ASN_TYPES_SOURCES)
-file(GLOB ASN_TYPES_HEADERS "${CMAKE_SOURCE_DIR}/src/core/libs/supl/types/*.h")
+file(GLOB ASN_TYPES_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/types/*.h")
 list(SORT ASN_TYPES_HEADERS)
 
 if(USE_CMAKE_TARGET_SOURCES)
@@ -60,12 +60,20 @@ target_include_directories(core_libs_supl
     PUBLIC
         ${GNUTLS_INCLUDE_DIR}
         ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl
-        ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp
-        ${CMAKE_SOURCE_DIR}/src/core/libs/supl/types
+        ${CMAKE_CURRENT_SOURCE_DIR}/asn-supl
+        ${CMAKE_CURRENT_SOURCE_DIR}/asn-rrlp
+        ${CMAKE_CURRENT_SOURCE_DIR}/types
 )
 
-set_target_properties(core_libs_supl PROPERTIES
-    LINKER_LANGUAGE C
-    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl;${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp;${CMAKE_SOURCE_DIR}/src/core/libs/supl/types;${GNUTLS_INCLUDE_DIR}"
+set_property(TARGET core_libs_supl
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/asn-supl>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/asn-rrlp>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/types>
+        $<BUILD_INTERFACE:${GNUTLS_INCLUDE_DIR}>
+)
+
+set_property(TARGET core_libs_supl
+    APPEND PROPERTY LINKER_LANGUAGE C
 )