Skip to content

Commit dec554f

Browse files
author
Marco Auer
committed
Updated internal wed version and switched curl to openssl on Windows
1 parent 40a97b9 commit dec554f

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

conanfile.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ def requirements(self):
2424
self.requires("libcurl/8.15.0")
2525
self.requires("glew/2.2.0")
2626
self.requires("jsoncpp/1.9.6")
27+
if self.settings.os == "Windows":
28+
self.requires("openssl/3.3.2")
2729
if self.settings.os == "Linux":
2830
self.requires("fltk/1.4.1")
2931
self.requires("egl/system")
@@ -35,6 +37,9 @@ def configure(self):
3537
self.options["glew"].shared = False
3638
self.options["glew"].with_glu = "system"
3739

40+
if self.settings.os == "Windows":
41+
self.options["libcurl"].with_ssl = "openssl"
42+
3843
def layout(self):
3944
cmake_layout(self)
4045

src/WEDCore/WED_Version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@
4141
// This numeric is used by the gateway to understand if our WED is up-to-date.
4242
// Format 1 digit major + 2 digit middle + 1 digit minor version + last digit
4343
// last digit is 0 for all beta versions or matches release version
44-
#define WED_VERSION_NUMERIC 20610
44+
#define WED_VERSION_NUMERIC 20700
4545

4646
#endif /* WED_Version_H */

0 commit comments

Comments
 (0)