Skip to content

Commit

Permalink
[gsl] fix gsl x64-linux-dynamic build by guarding win32 string replac…
Browse files Browse the repository at this point in the history
…es (#31504)

* Guard win32 string replaces

* update version

* Use target_compile_definitions for GSL_DLL

* Update version

* Revert "Use target_compile_definitions for GSL_DLL"

This reverts commit 9b228c1.

* Address review comments

* Update version

* Revert "Address review comments"

This reverts commit d6e911a.

* Address review comments

* Remove target_compile_definitions

* #ifndef WIN32 -> #ifndef _WIN32

* Update version

* Update port-version from 2 to 3

* ./vcpkg x-add-version --all

* Restore version 2 port-version in version/g-/gsl.json
  • Loading branch information
sjperkins authored May 22, 2023
1 parent 462885c commit 0ccb3d1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ports/gsl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ foreach(DIR IN LISTS FOLDERS)
endforeach()

file(READ gsl_types.h GSLTYPES_H)
string(REPLACE "#ifdef WIN32" "#if 1 /*WIN32*/" GSLTYPES_H "${GSLTYPES_H}")
string(REPLACE "#ifdef WIN32" "#ifdef _WIN32" GSLTYPES_H "${GSLTYPES_H}")
if(BUILD_SHARED_LIBS)
string(REPLACE "# ifdef GSL_DLL" "# if 1 /*GSL_DLL*/" GSLTYPES_H "${GSLTYPES_H}")
endif()
Expand Down
2 changes: 1 addition & 1 deletion ports/gsl/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "gsl",
"version": "2.7.1",
"port-version": 2,
"port-version": 3,
"description": "The GNU Scientific Library is a numerical library for C and C++ programmers",
"homepage": "https://www.gnu.org/software/gsl/",
"license": "GPL-3.0-or-later",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2966,7 +2966,7 @@
},
"gsl": {
"baseline": "2.7.1",
"port-version": 2
"port-version": 3
},
"gsl-lite": {
"baseline": "0.41.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/gsl.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "533b0147bfc479e315c3dc4c181675c302272ae4",
"version": "2.7.1",
"port-version": 3
},
{
"git-tree": "c9aa024bd4ce8327328a818b75cc6188de15ddd2",
"version": "2.7.1",
Expand Down

0 comments on commit 0ccb3d1

Please sign in to comment.