Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[gsl] fix gsl x64-linux-dynamic build by guarding win32 string replaces #31504

Merged
merged 15 commits into from
May 22, 2023
Merged

[gsl] fix gsl x64-linux-dynamic build by guarding win32 string replaces #31504

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a250934
Guard win32 string replaces
sjperkins May 18, 2023
fa7e2ad
update version
sjperkins May 18, 2023
9b228c1
Use target_compile_definitions for GSL_DLL
sjperkins May 18, 2023
2cd6c75
Update version
sjperkins May 18, 2023
3c437e2
Revert "Use target_compile_definitions for GSL_DLL"
sjperkins May 18, 2023
d6e911a
Address review comments
sjperkins May 18, 2023
2de6793
Update version
sjperkins May 18, 2023
282cfe5
Revert "Address review comments"
sjperkins May 18, 2023
f2b3b69
Address review comments
sjperkins May 18, 2023
c32af2b
Remove target_compile_definitions
sjperkins May 18, 2023
0be7259
#ifndef WIN32 -> #ifndef _WIN32
sjperkins May 18, 2023
077f33b
Update version
sjperkins May 18, 2023
8eefb99
Update port-version from 2 to 3
sjperkins May 19, 2023
4af764b
./vcpkg x-add-version --all
sjperkins May 19, 2023
1ac7ec9
Restore version 2 port-version in version/g-/gsl.json
sjperkins May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ports/gsl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,11 @@ foreach(DIR IN LISTS FOLDERS)
endforeach()

file(READ gsl_types.h GSLTYPES_H)
string(REPLACE "#ifdef WIN32" "#if 1 /*WIN32*/" GSLTYPES_H "${GSLTYPES_H}")
sjperkins marked this conversation as resolved.
Show resolved Hide resolved
if(BUILD_SHARED_LIBS)
string(REPLACE "# ifdef GSL_DLL" "# if 1 /*GSL_DLL*/" GSLTYPES_H "${GSLTYPES_H}")
endif()
sjperkins marked this conversation as resolved.
Show resolved Hide resolved
sjperkins marked this conversation as resolved.
Show resolved Hide resolved
if(WIN32)
sjperkins marked this conversation as resolved.
Show resolved Hide resolved
if(BUILD_SHARED_LIBS)
target_compile_definitions(gsl PRIVATE GSL_DLL)
endif()
endif(WIN32)
sjperkins marked this conversation as resolved.
Show resolved Hide resolved
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/gsl_types.h "${GSLTYPES_H}")

file(GLOB_RECURSE PUBLIC_HEADERS gsl*.h)
Expand Down
2 changes: 1 addition & 1 deletion versions/g-/gsl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"versions": [
{
"git-tree": "c9aa024bd4ce8327328a818b75cc6188de15ddd2",
"git-tree": "568ec043069dd8b8e13d24e0425cb759d0326ad1",
"version": "2.7.1",
"port-version": 2
},
Expand Down