Skip to content

Commit

Permalink
Updated Conan Package to Just 'Conan' for Get<lib>.cmake messages
Browse files Browse the repository at this point in the history
Verified I can build MiNiFi with conan build and standalone cmake.
Verified I can create MiNIFi conan package with conan create.
  • Loading branch information
james94 committed Oct 9, 2024
1 parent 374fff2 commit 1508fbe
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion cmake/GetBZip2.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

function(get_bzip2 SOURCE_DIR BINARY_DIR)
if(MINIFI_BZIP2_SOURCE STREQUAL "CONAN")
message("Using Conan Packager to install bzip2")
message("Using Conan to install bzip2")
find_package(BZip2 REQUIRED)
elseif(MINIFI_BZIP2_SOURCE STREQUAL "BUILD")
message("Using CMake to build bzip2 from source")
Expand Down
2 changes: 1 addition & 1 deletion cmake/GetCatch2.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

function(get_catch2)
if(MINIFI_CATCH2_SOURCE STREQUAL "CONAN")
message("Using Conan Packager to install Catch2")
message("Using Conan to install Catch2")
find_package(Catch2 REQUIRED)
add_library(Catch2WithMain ALIAS Catch2::Catch2WithMain)
elseif(MINIFI_CATCH2_SOURCE STREQUAL "BUILD")
Expand Down
2 changes: 1 addition & 1 deletion cmake/GetCivetWeb.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

function(get_civetweb)
if(MINIFI_CIVETWEB_SOURCE STREQUAL "CONAN")
message("Using Conan Packager to install CivetWeb")
message("Using Conan to install CivetWeb")
find_package(civetweb REQUIRED)
elseif(MINIFI_CIVETWEB_SOURCE STREQUAL "BUILD")
message("Using CMake to build CivetWeb from source")
Expand Down
2 changes: 1 addition & 1 deletion cmake/GetFmt.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

function(get_fmt)
if(MINIFI_FMT_SOURCE STREQUAL "CONAN")
message("Using Conan Packager to install Fmt")
message("Using Conan to install Fmt")
find_package(fmt REQUIRED)
elseif(MINIFI_FMT_SOURCE STREQUAL "BUILD")
message("Using CMake to build Fmt from source")
Expand Down
2 changes: 1 addition & 1 deletion cmake/GetLibCURL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

function(get_curl SOURCE_DIR BINARY_DIR)
if(MINIFI_LIBCURL_SOURCE STREQUAL "CONAN")
message("Using Conan Packager to install libcurl")
message("Using Conan to install libcurl")
find_package(CURL REQUIRED)
elseif(MINIFI_LIBCURL_SOURCE STREQUAL "BUILD")
message("Using CMake to build libcurl from source")
Expand Down
2 changes: 1 addition & 1 deletion cmake/GetLibXml2.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

function(get_libxml2 SOURCE_DIR BINARY_DIR)
if(MINIFI_LIBXML2_SOURCE STREQUAL "CONAN")
message("Using Conan Packager to install libxml2")
message("Using Conan to install libxml2")
find_package(libxml2 REQUIRED)
elseif(MINIFI_LIBXML2_SOURCE STREQUAL "BUILD")
message("Using CMake to build libxml2 from source")
Expand Down
2 changes: 1 addition & 1 deletion cmake/GetOpenSSL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

function(get_openssl SOURCE_DIR BINARY_DIR)
if(MINIFI_OPENSSL_SOURCE STREQUAL "CONAN")
message("Using Conan Packager to install OpenSSL")
message("Using Conan to install OpenSSL")
find_package(OpenSSL REQUIRED)
elseif(MINIFI_OPENSSL_SOURCE STREQUAL "BUILD")
message("Using CMake to build OpenSSL from source")
Expand Down
2 changes: 1 addition & 1 deletion cmake/GetRocksDB.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

function(get_rocksdb SOURCE_DIR BINARY_DIR)
if(MINIFI_ROCKSDB_SOURCE STREQUAL "CONAN")
message("Using Conan Packager to install RocksDB")
message("Using Conan to install RocksDB")
find_package(RocksDB REQUIRED)
add_library(RocksDB::RocksDB ALIAS RocksDB::rocksdb)
elseif(MINIFI_ROCKSDB_SOURCE STREQUAL "BUILD")
Expand Down
2 changes: 1 addition & 1 deletion cmake/GetSpdlog.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function(get_spdlog)
get_fmt()

if(MINIFI_SPDLOG_SOURCE STREQUAL "CONAN")
message("Using Conan Packager to install spdlog")
message("Using Conan to install spdlog")
find_package(spdlog REQUIRED)

add_library(spdlog ALIAS spdlog::spdlog)
Expand Down
2 changes: 1 addition & 1 deletion cmake/GetZLIB.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

function(get_zlib SOURCE_DIR BINARY_DIR)
if(MINIFI_ZLIB_SOURCE STREQUAL "CONAN")
message("Using Conan Packager to install zlib")
message("Using Conan to install zlib")
find_package(ZLIB REQUIRED)
elseif(MINIFI_ZLIB_SOURCE STREQUAL "BUILD")
message("Using CMake to build zlib from source")
Expand Down
2 changes: 1 addition & 1 deletion cmake/GetZstd.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

function(get_zstd)
if(MINIFI_ZSTD_SOURCE STREQUAL "CONAN")
message("Using Conan Packager to install zstd")
message("Using Conan to install zstd")
find_package(zstd REQUIRED)
add_library(zstd::zstd ALIAS zstd::libzstd_static)
elseif(MINIFI_ZSTD_SOURCE STREQUAL "BUILD")
Expand Down

0 comments on commit 1508fbe

Please sign in to comment.