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 042a0b44286232692c5d20a1d4915dedd7a87bf2..61aeb9facf171fcef0e47cabb63d8b863d250f8d 100644 (file)
--- 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 c4f393b46262ed252da565d24a8037395ff46506..54549c8eb5c859d99cd693f70e11873696021c13 100644 (file)
--- 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 c107e8e18cf79526009bc3f59765ce2b8b0eed5b..4607427ffd4e7e165725e266fe9513d8149c5ec8 100644 (file)
--- 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 ab6ee4a6d30781d8694738c534fb6dbb297fada1..67abaa932c849f94f0b53d577437b0eb93cdfba5 100644 (file)
--- 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 0ea75515cde90cf7e663337a41084f1d7b5af31a..2c593faa9ea164b79f3f4dd64ef0323f9353e84e 100644 (file)
--- 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 49593f107eda13e69d01df1d2a54841faa9aa0bc..ff3eee652b4fc737741eb2b0bdb9692e5d437840 100644 (file)
--- 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})