From 2f9f0108efa8ac2424e08a80eeb2d72e4d2aa00d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 24 Aug 2023 14:27:02 +0000 Subject: [PATCH] build: Rename cmake scripts by platform client/server spec Now that we've added another cmake preset (data-stream-suite) some scripts (GetLinuxClient*.cmake) are shared by multiple presets. --- src/lib/CMakeLists.txt | 14 +++++++------- ...ies.cmake => GetLinuxClientLinkLibraries.cmake} | 0 ...erSources.cmake => GetLinuxClientSources.cmake} | 0 ...ies.cmake => GetLinuxServerLinkLibraries.cmake} | 0 ...kdSources.cmake => GetLinuxServerSources.cmake} | 0 ...s.cmake => GetWindowsClientLinkLibraries.cmake} | 0 ...Sources.cmake => GetWindowsClientSources.cmake} | 0 7 files changed, 7 insertions(+), 7 deletions(-) rename src/lib/cmake/{GetApiServerLinkLibraries.cmake => GetLinuxClientLinkLibraries.cmake} (100%) rename src/lib/cmake/{GetApiServerSources.cmake => GetLinuxClientSources.cmake} (100%) rename src/lib/cmake/{GetSparkdLinkLibraries.cmake => GetLinuxServerLinkLibraries.cmake} (100%) rename src/lib/cmake/{GetSparkdSources.cmake => GetLinuxServerSources.cmake} (100%) rename src/lib/cmake/{GetSparkLinkLibraries.cmake => GetWindowsClientLinkLibraries.cmake} (100%) rename src/lib/cmake/{GetSparkSources.cmake => GetWindowsClientSources.cmake} (100%) diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index fd71b7bd1..58aabc2b0 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -15,14 +15,14 @@ if(WIN32) message(FATAL_ERROR "Cannot build sparkd on Windows (Please set BUILD_SPARKD to False)") endif() - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetSparkSources.cmake) - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetSparkLinkLibraries.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetWindowsClientSources.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetWindowsClientLinkLibraries.cmake) elseif(${BUILD_SPARKD}) - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetSparkdSources.cmake) - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetSparkdLinkLibraries.cmake) -elseif(${BUILD_API_SERVER}) - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetApiServerSources.cmake) - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetApiServerLinkLibraries.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetLinuxServerSources.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetLinuxServerLinkLibraries.cmake) +else() + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetLinuxClientSources.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetLinuxClientLinkLibraries.cmake) endif() # Cpp sources diff --git a/src/lib/cmake/GetApiServerLinkLibraries.cmake b/src/lib/cmake/GetLinuxClientLinkLibraries.cmake similarity index 100% rename from src/lib/cmake/GetApiServerLinkLibraries.cmake rename to src/lib/cmake/GetLinuxClientLinkLibraries.cmake diff --git a/src/lib/cmake/GetApiServerSources.cmake b/src/lib/cmake/GetLinuxClientSources.cmake similarity index 100% rename from src/lib/cmake/GetApiServerSources.cmake rename to src/lib/cmake/GetLinuxClientSources.cmake diff --git a/src/lib/cmake/GetSparkdLinkLibraries.cmake b/src/lib/cmake/GetLinuxServerLinkLibraries.cmake similarity index 100% rename from src/lib/cmake/GetSparkdLinkLibraries.cmake rename to src/lib/cmake/GetLinuxServerLinkLibraries.cmake diff --git a/src/lib/cmake/GetSparkdSources.cmake b/src/lib/cmake/GetLinuxServerSources.cmake similarity index 100% rename from src/lib/cmake/GetSparkdSources.cmake rename to src/lib/cmake/GetLinuxServerSources.cmake diff --git a/src/lib/cmake/GetSparkLinkLibraries.cmake b/src/lib/cmake/GetWindowsClientLinkLibraries.cmake similarity index 100% rename from src/lib/cmake/GetSparkLinkLibraries.cmake rename to src/lib/cmake/GetWindowsClientLinkLibraries.cmake diff --git a/src/lib/cmake/GetSparkSources.cmake b/src/lib/cmake/GetWindowsClientSources.cmake similarity index 100% rename from src/lib/cmake/GetSparkSources.cmake rename to src/lib/cmake/GetWindowsClientSources.cmake