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.

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

[many ports] Include functional to fix error C2039 and C2504 #30946

Merged
merged 30 commits into from
Apr 27, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
80e70ab
[many ports] Include functional to fix error C2039 and C2504
LilyWangLL Apr 18, 2023
3183c48
update version
LilyWangLL Apr 18, 2023
e33dcf6
Apply suggestions
LilyWangLL Apr 18, 2023
8a80343
update version
LilyWangLL Apr 18, 2023
5ee82a4
update version
LilyWangLL Apr 18, 2023
f228735
Rename Include_functional.patch to include_functional.patch
LilyWangLL Apr 18, 2023
f9294c0
Rename Include_functional.patch to include_functional.patch
LilyWangLL Apr 18, 2023
4d53d95
Rename Include_functional.patch to include_functional.patch
LilyWangLL Apr 18, 2023
e0aee6c
Rename Include_functional.patch to include_functional.patch
LilyWangLL Apr 18, 2023
0468d34
Rename Include_functional.patch to include_functional.patch
LilyWangLL Apr 18, 2023
5c4cdaa
Rename Include_functional.patch to include_functional.patch
LilyWangLL Apr 18, 2023
d9df7d2
update version
LilyWangLL Apr 18, 2023
a020638
update libsbml to latest version
LilyWangLL Apr 18, 2023
f188bfb
update version
LilyWangLL Apr 18, 2023
71acefc
Update libsbml.json
LilyWangLL Apr 18, 2023
7be2834
fix libsbml build error
LilyWangLL Apr 19, 2023
02f776f
Merge branch 'dev/LilyWang/CI_Unstable_0417' of https://github.com/Li…
LilyWangLL Apr 19, 2023
39c4849
update version
LilyWangLL Apr 19, 2023
1101381
fix libsbml
LilyWangLL Apr 20, 2023
2d55180
update version
LilyWangLL Apr 20, 2023
9b06c41
update version
LilyWangLL Apr 20, 2023
0fbcbab
Merge branch 'master' into dev/LilyWang/CI_Unstable_0417
LilyWangLL Apr 24, 2023
013e812
fix conflicts
LilyWangLL Apr 24, 2023
96ce51b
update version
LilyWangLL Apr 24, 2023
d162a4d
revert changes of libsbml
LilyWangLL Apr 27, 2023
71ab595
update version
LilyWangLL Apr 27, 2023
eb74560
Update libsbml.json
LilyWangLL Apr 27, 2023
ac9f3b9
Merge branch 'master' into dev/LilyWang/CI_Unstable_0417
LilyWangLL Apr 27, 2023
a286866
resolve conflicts
LilyWangLL Apr 27, 2023
4621f50
update version
LilyWangLL Apr 27, 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
49 changes: 49 additions & 0 deletions ports/libsbml/fix-cmake.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
diff --git a/CMakeModules/FindLIBXML.cmake b/CMakeModules/FindLIBXML.cmake
LilyWangLL marked this conversation as resolved.
Show resolved Hide resolved
index 73e5f5a..f7ff0e7 100644
--- a/CMakeModules/FindLIBXML.cmake
+++ b/CMakeModules/FindLIBXML.cmake
@@ -66,7 +66,7 @@ if (EXISTS ${LIBICONV_LIBRARY})
set(ADDITIONAL_LIBS "${ADDITIONAL_LIBS}${LIBICONV_LIBRARY};")
endif()
find_package(ZLIB QUIET)
-if (EXISTS ${ZLIB_LIBRARY})
+if (ZLIB_FOUND)
set(ADDITIONAL_LIBS "${ADDITIONAL_LIBS}ZLIB::ZLIB;")
endif()
if (WIN32)
@@ -91,7 +91,7 @@ if(NOT TARGET LIBXML::LIBXML)
endif()

# figure out if we need XML_STATIC flag
-if (LIBXML_INCLUDE_DIR AND LIBXML_LIBRARY)
+if (0)

set(LIBXML_LIBXML_CODE
"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 79301a6..b3deb41 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -536,18 +536,18 @@ if (${CMAKE_VERSION} VERSION_GREATER 2.8.7)

CONFIGURE_PACKAGE_CONFIG_FILE(
${CMAKE_CURRENT_LIST_DIR}/libsbml-static-config.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/${LIBSBML_LIBRARY}-static-config.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/${LIBSBML_LIBRARY}-config.cmake
INSTALL_DESTINATION ${PACKAGE_CONFIG_DIR})

WRITE_BASIC_PACKAGE_VERSION_FILE(
- ${CMAKE_CURRENT_BINARY_DIR}/${LIBSBML_LIBRARY}-static-config-version.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/${LIBSBML_LIBRARY}-config-version.cmake
VERSION ${PROJECT_VERSION}
COMPATIBILITY AnyNewerVersion
)

INSTALL(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/${LIBSBML_LIBRARY}-static-config-version.cmake
- ${CMAKE_CURRENT_BINARY_DIR}/${LIBSBML_LIBRARY}-static-config.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/${LIBSBML_LIBRARY}-config-version.cmake
LilyWangLL marked this conversation as resolved.
Show resolved Hide resolved
+ ${CMAKE_CURRENT_BINARY_DIR}/${LIBSBML_LIBRARY}-config.cmake
DESTINATION ${PACKAGE_CONFIG_DIR}
)
endif()
13 changes: 0 additions & 13 deletions ports/libsbml/fix-static-build.patch

This file was deleted.

8 changes: 2 additions & 6 deletions ports/libsbml/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ vcpkg_from_github(
SHA512 c40f164ebd05a36f140ce2684dedb4bbccc51a2732383d3935fca1258738a9b9ba5bc1be2061f3b113b213e5cbb7fe22e9dca43ff78d91964c79cad093e55466
HEAD_REF development
PATCHES
fix-static-build.patch
fix-cmake.patch
)

string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_RUNTIME)
Expand Down Expand Up @@ -61,11 +61,7 @@ vcpkg_cmake_configure(

vcpkg_cmake_install()

if(BUILD_SHARED_LIBS)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
else()
vcpkg_cmake_config_fixup(PACKAGE_NAME libsbml-static CONFIG_PATH lib/cmake)
endif()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)

vcpkg_copy_pdbs()

Expand Down