Fixes PKG_CONFIG spelling

adityanarayanm095 · May 26, 2021 · 45e4627 · 45e4627
1 parent 851d8b2
commit 45e4627
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 7 deletions.
diff --git a/cmake-proxies/CMakeLists.txt b/cmake-proxies/CMakeLists.txt
@@ -2,7 +2,7 @@ add_conan_lib(
    ZLIB
    zlib/1.2.11
    REQUIRED
-   PGK_CONFIG "zlib >= 1.2.11"
+   PKG_CONFIG "zlib >= 1.2.11"
    INTERFACE_NAME ZLIB::ZLIB
    OPTION_NAME zlib
    CONAN_OPTIONS 
@@ -13,7 +13,7 @@ add_conan_lib(
    expat
    expat/2.2.9
    REQUIRED
-   PGK_CONFIG "expat >= 2.1.0"
+   PKG_CONFIG "expat >= 2.1.0"
    CONAN_OPTIONS 
       expat:shared=True
 )
@@ -70,14 +70,14 @@ add_conan_lib(
    libmp3lame/3.100
    REQUIRED
    INTERFACE_NAME libmp3lame::libmp3lame
-   PGK_CONFIG "lame >= 3.100"
+   PKG_CONFIG "lame >= 3.100"
 )
 
 add_conan_lib(
    libid3tag
    libid3tag/0.15.2b@audacity/stable
    OPTION_NAME id3tag
-   PGK_CONFIG "id3tag >= 0.15.1b"
+   PKG_CONFIG "id3tag >= 0.15.1b"
    CONAN_OPTIONS
       libid3tag:zlib=${id3tag_zlib}
 )
@@ -86,7 +86,36 @@ add_conan_lib(
    libmad
    libmad/0.15.2b@audacity/stable
    OPTION_NAME mad
-   PGK_CONFIG "mad >= 0.15.1b"
+   PKG_CONFIG "mad >= 0.15.1b"
+)
+
+if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
+   set( curl_ssl "darwinssl" )
+elseif( CMAKE_SYSTEM_NAME MATCHES "Windows" )
+   set( curl_ssl "schannel")
+else()
+   set ( curl_ssl "openssl" )
+endif ()
+
+add_conan_lib(
+   ThreadPool
+   threadpool/20140926
+   REQUIRED
+   ALWAYS_ALLOW_CONAN_FALLBACK
+)
+
+add_conan_lib(
+   CURL
+   libcurl/7.75.0
+   REQUIRED
+   OPTION_NAME curl
+   PKG_CONFIG "libcurl >= 7.68.0"
+   INTERFACE_NAME CURL::libcurl
+   FIND_PACKAGE_OPTIONS 
+      COMPONENTS HTTP HTTPS SSL
+   CONAN_OPTIONS
+      libcurl:with_ssl=${curl_ssl}
+      libcurl:shared=True
 )
 
 set_conan_vars_to_parent()

diff --git a/cmake-proxies/cmake-modules/AudacityDependencies.cmake b/cmake-proxies/cmake-modules/AudacityDependencies.cmake
@@ -22,7 +22,7 @@ set( CONAN_RESOLVE_LIST )
 #   SYMBOL WXWIDGET
 #   REQUIRED 
 #   ALWAYS_ALLOW_CONAN_FALLBACK
-#   PGK_CONFIG "wxwidgets >= 3.1.3"
+#   PKG_CONFIG "wxwidgets >= 3.1.3"
 #   FIND_PACKAGE_OPTIONS COMPONENTS adv base core html qa xml
 #   INTERFACE_NAME wxwidgets::wxwidgets
 #   HAS_ONLY_DEBUG_RELEASE
@@ -57,7 +57,7 @@ function (add_conan_lib package conan_package_name )
         elseif ( opt STREQUAL "CONAN_OPTIONS" )
             set( list_mode on )
             set( current_var "conan_package_options" )
-        elseif ( opt STREQUAL "PGK_CONFIG" )
+        elseif ( opt STREQUAL "PKG_CONFIG" )
             set( list_mode on )
             set( current_var "pkg_config_options" )
         elseif ( opt STREQUAL "OPTION_NAME" )