From: Joel Rosdahl <joel@rosdahl.net>
Date: Wed, 7 Sep 2022 20:06:56 +0000 (+0200)
Subject: build: Remove now redundant CMAKE_CURRENT_SOURCE_DIR usage
X-Git-Tag: v4.7~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10ee2d1fe5e4f8fbe240e7ff83d5e348ee8aea65;p=thirdparty%2Fccache.git

build: Remove now redundant CMAKE_CURRENT_SOURCE_DIR usage

As of CMake 3.13, target_sources works as expected with relative paths
in subdirectories.
---

diff --git a/src/compression/CMakeLists.txt b/src/compression/CMakeLists.txt
index 042a0b442..61aeb9fac 100644
--- a/src/compression/CMakeLists.txt
+++ b/src/compression/CMakeLists.txt
@@ -1,12 +1,12 @@
 set(
   sources
-  ${CMAKE_CURRENT_SOURCE_DIR}/Compressor.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/Decompressor.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/NullCompressor.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/NullDecompressor.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/ZstdCompressor.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/ZstdDecompressor.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/types.cpp
+  Compressor.cpp
+  Decompressor.cpp
+  NullCompressor.cpp
+  NullDecompressor.cpp
+  ZstdCompressor.cpp
+  ZstdDecompressor.cpp
+  types.cpp
 )
 
 target_sources(ccache_framework PRIVATE ${sources})
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index c4f393b46..54549c8eb 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,14 +1,14 @@
 set(
   sources
-  ${CMAKE_CURRENT_SOURCE_DIR}/CacheEntryHeader.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/CacheEntryReader.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/CacheEntryWriter.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/Manifest.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/Statistics.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/StatisticsCounters.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/StatsLog.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/mainoptions.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/types.cpp
+  CacheEntryHeader.cpp
+  CacheEntryReader.cpp
+  CacheEntryWriter.cpp
+  Manifest.cpp
+  Statistics.cpp
+  StatisticsCounters.cpp
+  StatsLog.cpp
+  mainoptions.cpp
+  types.cpp
 )
 
 target_sources(ccache_framework PRIVATE ${sources})
diff --git a/src/storage/CMakeLists.txt b/src/storage/CMakeLists.txt
index c107e8e18..4607427ff 100644
--- a/src/storage/CMakeLists.txt
+++ b/src/storage/CMakeLists.txt
@@ -3,7 +3,7 @@ add_subdirectory(secondary)
 
 set(
   sources
-  ${CMAKE_CURRENT_SOURCE_DIR}/Storage.cpp
+  Storage.cpp
 )
 
 target_sources(ccache_framework PRIVATE ${sources})
diff --git a/src/storage/primary/CMakeLists.txt b/src/storage/primary/CMakeLists.txt
index ab6ee4a6d..67abaa932 100644
--- a/src/storage/primary/CMakeLists.txt
+++ b/src/storage/primary/CMakeLists.txt
@@ -1,12 +1,12 @@
 set(
   sources
-  ${CMAKE_CURRENT_SOURCE_DIR}/CacheFile.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/PrimaryStorage.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/PrimaryStorage_cleanup.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/PrimaryStorage_compress.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/PrimaryStorage_statistics.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/StatsFile.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/util.cpp
+  CacheFile.cpp
+  PrimaryStorage.cpp
+  PrimaryStorage_cleanup.cpp
+  PrimaryStorage_compress.cpp
+  PrimaryStorage_statistics.cpp
+  StatsFile.cpp
+  util.cpp
 )
 
 target_sources(ccache_framework PRIVATE ${sources})
diff --git a/src/storage/secondary/CMakeLists.txt b/src/storage/secondary/CMakeLists.txt
index 0ea75515c..2c593faa9 100644
--- a/src/storage/secondary/CMakeLists.txt
+++ b/src/storage/secondary/CMakeLists.txt
@@ -1,12 +1,12 @@
 set(
   sources
-  ${CMAKE_CURRENT_SOURCE_DIR}/FileStorage.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/HttpStorage.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/SecondaryStorage.cpp
+  FileStorage.cpp
+  HttpStorage.cpp
+  SecondaryStorage.cpp
 )
 
 if(REDIS_STORAGE_BACKEND)
-  list(APPEND sources ${CMAKE_CURRENT_SOURCE_DIR}/RedisStorage.cpp)
+  list(APPEND sources RedisStorage.cpp)
 endif()
 
 target_sources(ccache_framework PRIVATE ${sources})
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 49593f107..ff3eee652 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -1,11 +1,11 @@
 set(
   sources
-  ${CMAKE_CURRENT_SOURCE_DIR}/LockFile.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextTable.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/Tokenizer.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/file.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/path.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/string.cpp
+  LockFile.cpp
+  TextTable.cpp
+  Tokenizer.cpp
+  file.cpp
+  path.cpp
+  string.cpp
 )
 
 target_sources(ccache_framework PRIVATE ${sources})