haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make libcurl a required dependency and always build KICAD_CURL

This commit is contained in:
Jon Evans 2020-02-23 11:35:01 -05:00
parent 9f8ff236d6
commit 009641d151
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -648,11 +648,9 @@ find_package( GLM 0.9.5.1 REQUIRED )
add_definitions( -DGLM_FORCE_CTOR_INIT ) add_definitions( -DGLM_FORCE_CTOR_INIT )
# #
# Find CURL library, required for github plugin # Find CURL library, required
# #
if( BUILD_GITHUB_PLUGIN )
find_package( CURL REQUIRED ) find_package( CURL REQUIRED )
endif()
# #
# Find Cairo library, required # Find Cairo library, required

9
common/CMakeLists.txt
View File

@ -303,6 +303,8 @@ set( COMMON_SRCS
hotkey_store.cpp hotkey_store.cpp
hotkeys_basic.cpp hotkeys_basic.cpp
html_messagebox.cpp html_messagebox.cpp
kicad_curl/kicad_curl.cpp
kicad_curl/kicad_curl_easy.cpp
kiface_i.cpp kiface_i.cpp
kiway.cpp kiway.cpp
kiway_express.cpp kiway_express.cpp
@ -351,13 +353,6 @@ if( NOT HAVE_STRTOKR )
list( APPEND COMMON_SRCS strtok_r.c ) list( APPEND COMMON_SRCS strtok_r.c )
endif() endif()
if( BUILD_GITHUB_PLUGIN )
list( APPEND COMMON_SRCS
kicad_curl/kicad_curl.cpp
kicad_curl/kicad_curl_easy.cpp
)
endif()
set( COMMON_SRCS set( COMMON_SRCS
${COMMON_SRCS} ${COMMON_SRCS}

8
common/dialog_about/dialog_about.cpp
View File

@ -30,13 +30,12 @@
// kicad_curl.h must be included before wx headers, to avoid // kicad_curl.h must be included before wx headers, to avoid
// conflicts for some defines, at least on Windows // conflicts for some defines, at least on Windows
#ifdef BUILD_GITHUB_PLUGIN
// kicad_curl.h can create conflicts for some defines, at least on Windows // kicad_curl.h can create conflicts for some defines, at least on Windows
// so we are using here 2 proxy functions to know Curl version to avoid // so we are using here 2 proxy functions to know Curl version to avoid
// including kicad_curl.h to know Curl version // including kicad_curl.h to know Curl version
extern std::string GetKicadCurlVersion(); extern std::string GetKicadCurlVersion();
extern std::string GetCurlLibVersion(); extern std::string GetCurlLibVersion();
#endif
#if defined( KICAD_USE_OCC ) | defined( KICAD_USE_OCE ) #if defined( KICAD_USE_OCC ) | defined( KICAD_USE_OCE )
#include <Standard_Version.hxx> #include <Standard_Version.hxx>
#endif #endif
@ -492,9 +491,8 @@ void DIALOG_ABOUT::buildVersionInfoData( wxString& aMsg, bool aFormatHtml )
aMsg << "Libraries:" << eol; aMsg << "Libraries:" << eol;
aMsg << indent4 << wxGetLibraryVersionInfo().GetVersionString() << eol; aMsg << indent4 << wxGetLibraryVersionInfo().GetVersionString() << eol;
#ifdef BUILD_GITHUB_PLUGIN
aMsg << indent4 << GetKicadCurlVersion() << eol; aMsg << indent4 << GetKicadCurlVersion() << eol;
#endif
aMsg << "Platform: " << wxGetOsDescription() << ", " aMsg << "Platform: " << wxGetOsDescription() << ", "
<< platform.GetArchName() << ", " << platform.GetArchName() << ", "
<< platform.GetEndiannessName() << ", " << platform.GetEndiannessName() << ", "
@ -528,9 +526,7 @@ void DIALOG_ABOUT::buildVersionInfoData( wxString& aMsg, bool aFormatHtml )
aMsg << indent4 << "OpenCASCADE Community Edition: " << OCC_VERSION_COMPLETE << eol; aMsg << indent4 << "OpenCASCADE Community Edition: " << OCC_VERSION_COMPLETE << eol;
#endif #endif
#ifdef BUILD_GITHUB_PLUGIN
aMsg << indent4 << "Curl: " << GetCurlLibVersion() << eol; aMsg << indent4 << "Curl: " << GetCurlLibVersion() << eol;
#endif
aMsg << indent4 << "Compiler: "; aMsg << indent4 << "Compiler: ";
#if defined(__clang__) #if defined(__clang__)