more unused clean

CMakeLists.txt

@@ -34,14 +34,6 @@ if(CODE_COVERAGE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
   endif()
 endif()
 
-if (CMAKE_SYSTEM_NAME MATCHES "Linux")
-  set(LINUX_DETECTED TRUE)
-endif()
-
-geocore_set_platform_var(PLATFORM_MAC "macx-.*" ${APPLE})
-geocore_set_platform_var(PLATFORM_LINUX "linux-.*" ${LINUX_DETECTED})
-
-
 # Set build type:
 if (NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE "Release")
@@ -109,10 +101,6 @@ find_package(Threads)
 
 find_package(Boost ${BOOST_VERSION} EXACT COMPONENTS system filesystem serialization iostreams program_options REQUIRED)
 set(Boost_USE_MULTITHREADED ON)
-if (PLATFORM_MAC)
-    set(Boost_USE_STATIC_LIBS ON)
-    set(Boost_USE_STATIC_RUNTIME ON)
-endif()
 
 include_directories(${CMAKE_HOME_DIRECTORY})
 include_directories(SYSTEM ${Boost_INCLUDE_DIRS})

cmake/GeoCoreHelpers.cmake

@@ -70,16 +70,6 @@ endfunction()
 
 function(geocore_link_platform_deps target)
   if ("${ARGN}" MATCHES "platform")
-    if (PLATFORM_MAC)
-      target_link_libraries(
-        ${target}
-        "-framework CFNetwork"
-        "-framework Foundation"
-        "-framework IOKit"
-        "-framework SystemConfiguration"
-        "-framework Security"
-      )
-    endif()
   endif()
 endfunction()
 

platform/platform.hpp

@@ -20,11 +20,6 @@
 DECLARE_EXCEPTION(FileAbsentException, RootException);
 DECLARE_EXCEPTION(FileSystemException, RootException);
 
-namespace platform
-{
-class LocalCountryFile;
-}
-
 class Platform;
 
 Platform & GetPlatform();
@@ -54,13 +49,6 @@ public:
     FILE_TYPE_DIRECTORY = 0x4
   };
 
-  enum class Thread : uint8_t
-  {
-    File,
-    Network,
-    Background,
-  };
-
   using TFilesWithType = std::vector<std::pair<std::string, EFileType>>;
 
 protected:
@@ -72,17 +60,9 @@ protected:
   /// Temporary directory, can be cleaned up by the system
   std::string m_tmpDir;
 
-  /// Extended resource files.
-  /// Used in Android only (downloaded zip files as a container).
-  std::vector<std::string> m_extResFiles;
-
   /// Returns last system call error as EError.
   static EError ErrnoToError();
 
-  std::unique_ptr<base::thread_pool::delayed::ThreadPool> m_networkThread;
-  std::unique_ptr<base::thread_pool::delayed::ThreadPool> m_fileThread;
-  std::unique_ptr<base::thread_pool::delayed::ThreadPool> m_backgroundThread;
-
 public:
   Platform();
   virtual ~Platform() = default;
@@ -159,7 +139,6 @@ public:
                             FilesList & outFiles);
   static void GetFilesByRegExp(std::string const & directory, std::string const & regexp,
                                FilesList & outFiles);
-  //@}
 
   static void GetFilesByType(std::string const & directory, unsigned typeMask,
                              TFilesWithType & outFiles);
@@ -180,14 +159,6 @@ public:
   static bool GetFileSizeByFullPath(std::string const & filePath, uint64_t & size);
   //@}
 
-  /// Used to check available free storage space for downloading.
-  enum TStorageStatus
-  {
-    STORAGE_OK = 0,
-    STORAGE_DISCONNECTED,
-    NOT_ENOUGH_SPACE
-  };
-
   // Please note, that number of active cores can vary at runtime.
   // DO NOT assume for the same return value between calls.
   unsigned CpuCores() const;

platform/platform_tests/CMakeLists.txt

@@ -18,15 +18,3 @@ geocore_link_libraries(
   platform
 )
 
-if (PLATFORM_MAC)
-  geocore_link_libraries(
-    ${PROJECT_NAME}
-    "-framework QuartzCore"
-  )
-endif()
-
-if (PLATFORM_WIN OR PLATFORM_LINUX)
-  geocore_link_libraries(
-    ${PROJECT_NAME}
-  )
-endif()