Fixed build issue #12

Merged
kdeng00 merged 1 commits from build_fix into v0.3 2022-08-07 19:59:29 -04:00
4 changed files with 28 additions and 21 deletions
+24 -17
View File
@@ -1,41 +1,48 @@
cmake_minimum_required(VERSION 3.14) cmake_minimum_required(VERSION 3.23.3)
set(SOFTWARE_DESCRIPTION
"A music streaming Web API that provides a way for users to stream their personal music collection")
set(SOFTWARE_VERSION
"0.3.0")
project(IcarusDownloadManager) project(IcarusDownloadManager VERSION ${SOFTWARE_VERSION} DESCRIPTION ${SOFTWARE_DESCRIPTION} LANGUAGES CXX)
message(STATUS "Checking compiler flags for C++17 support.") message(STATUS "Checking compiler flags for C++20 support.")
# Set C++17 support flags for various compilers # Set C++20 support flags for various compilers
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
if(WIN32) if(WIN32)
message("Windows") message("Windows environment")
set(vs_ver 19.29.30138)
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL ${vs_ver}) if (MSVC_VERSION GREATER_EQUAL "1900")
message("Visual Studio version is at least ${vs_ver}") message("Visual Studio version is at least ${vs_ver}")
set(CMAKE_CXX_STANDARD_COMPILE_OPTION "-std:c++latest") include(CheckCXXCompilerFlag)
set(CMAKE_CXX_EXTENSION_COMPILE_OPTION "-std:c++latest") CHECK_CXX_COMPILER_FLAG("/std:c++20" _cpp_latest_flag_supported)
if (_cpp_latest_flag_supported)
add_compile_options("/std:c++20")
endif()
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
endif() endif()
else() else()
check_cxx_compiler_flag("-std=c++17" COMPILER_SUPPORTS_CXX17) check_cxx_compiler_flag("-std=c++20" COMPILER_SUPPORTS_CXX20)
check_cxx_compiler_flag("-std=c++0x" COMPILER_SUPPORTS_CXX0X) check_cxx_compiler_flag("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
if(COMPILER_SUPPORTS_CXX17) if(COMPILER_SUPPORTS_CXX20)
message(STATUS "C++17 is supported.") message(STATUS "C++20 is supported.")
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -stdlib=libc++") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20 -stdlib=libc++")
else() else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20")
endif() endif()
elseif(COMPILER_SUPPORTS_CXX0X) elseif(COMPILER_SUPPORTS_CXX0X)
message(STATUS "C++0x is supported.") message(STATUS "C++0x is supported.")
@@ -45,7 +52,7 @@ else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
endif() endif()
else() else()
message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++17 support. Please use a different C++ compiler.") message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++20 support. Please use a different C++ compiler.")
endif() endif()
endif() endif()
+1 -1
View File
@@ -14,7 +14,7 @@ using Managers::CommitManager;
constexpr static auto IcarusDownloadManager_version() constexpr static auto IcarusDownloadManager_version()
{ {
return "v0.2.0"; return "v0.3.0";
} }
void printHelp() void printHelp()
+1 -1
View File
@@ -48,7 +48,7 @@ void ActionManager::initialize()
} }
void ActionManager::validateFlags() void ActionManager::validateFlags()
{ {
cout<<"Validating flags\n"; cout<<"Validating flags\n";
const auto flagVals = parsedFlags(); const auto flagVals = parsedFlags();
+2 -2
View File
@@ -308,8 +308,8 @@ void CommitManager::singTargetUpload(const std::string &songPath, const std::str
} }
song = *sng; song = *sng;
const auto p = fs::path(songPath); const auto p = filesystem::path(songPath);
song.directory = p.parent_path.string(); song.directory = p.parent_path().string();
song.generate_filename_from_track(); song.generate_filename_from_track();
Models::CoverArt cover; Models::CoverArt cover;