From dcfa9951d98bd6ca1d8326906468a5cb890b5ce8 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sun, 9 Jan 2022 02:04:56 -0500 Subject: [PATCH] Updated Readme --- CMakeLists.txt | 13 ++++++++++--- README.md | 2 +- conanfile.txt | 12 ++++++++++++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d0161e1..63c269e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,8 +16,11 @@ if(WIN32) if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL ${vs_ver}) message("Visual Studio version is at least ${vs_ver}") - set(CMAKE_CXX17_STANDARD_COMPILE_OPTION "-std:c++latest") - set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std:c++latest") + set(CMAKE_CXX_STANDARD_COMPILE_OPTION "-std:c++latest") + set(CMAKE_CXX_EXTENSION_COMPILE_OPTION "-std:c++latest") + + set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) endif() else() check_cxx_compiler_flag("-std=c++17" COMPILER_SUPPORTS_CXX17) @@ -67,7 +70,11 @@ set(IDM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include") # conan -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) +set(CONAN_BUILDINFO +${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) + +message("conan build info ${CONAN_BUILDINFO}") +include(${CONAN_BUILDINFO}) conan_basic_setup() include_directories(${CPR_INCLUDE_DIRS} ${IDM_INCLUDE_DIR}) diff --git a/README.md b/README.md index 6b02d47..16e8363 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ cmake --build . -j The program has been built and can be executed by the binary file *icd*. For information on how to use icd, merely execute the program without any command line arguments. ### Downloading Song -``BASH +```BASH icd download -u spacecadet -p stellar40 -h https://icarus.com -b 15 ``` diff --git a/conanfile.txt b/conanfile.txt index 1a26411..cf5429e 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -6,3 +6,15 @@ cpr/1.7.2 [generators] cmake + +[options] +openssl:shared=False +libcurl:shared=False +cpr:shared=False +libcurl:with_ssl=openssl +libcurl:with_ftp=False +libcurl:with_gopher=False +libcurl:with_imap=False +libcurl:with_pop3=False +libcurl:with_smb=False +libcurl:with_smtp=False \ No newline at end of file