Skip to content

Commit

Permalink
[ois] fix pkgconfig file not installed on windows (#23426)
Browse files Browse the repository at this point in the history
* [ois] fix pkgconfig file not installed on windows

* fix debug suffix
  • Loading branch information
maz-1 committed Mar 11, 2022
1 parent 4c58b84 commit 9a6b6da
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 1 deletion.
29 changes: 29 additions & 0 deletions ports/ois/0001_install_pkgconfig_win32.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
diff -Naur a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2021-05-14 03:09:42.000000000 +0800
+++ b/CMakeLists.txt 2022-03-08 12:48:17.012589000 +0800
@@ -255,7 +255,12 @@
install(FILES $<TARGET_PDB_FILE:OIS> DESTINATION bin OPTIONAL)
endif(MSVC AND BUILD_SHARED_LIBS)

-if(UNIX)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OIS.pc.in ${CMAKE_BINARY_DIR}/OIS.pc @ONLY)
- install(FILES ${CMAKE_BINARY_DIR}/OIS.pc DESTINATION ${OIS_LIB_DIRECTORY}/pkgconfig)
+if (CMAKE_DEBUG_POSTFIX AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+ set(OIS_POSTFIX ${CMAKE_DEBUG_POSTFIX})
+else()
+ set(OIS_POSTFIX "")
endif()
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OIS.pc.in ${CMAKE_BINARY_DIR}/OIS.pc @ONLY)
+install(FILES ${CMAKE_BINARY_DIR}/OIS.pc DESTINATION ${OIS_LIB_DIRECTORY}/pkgconfig)
+
diff -Naur a/OIS.pc.in b/OIS.pc.in
--- a/OIS.pc.in 2021-05-14 03:09:42.000000000 +0800
+++ b/OIS.pc.in 2022-03-08 12:48:33.599696300 +0800
@@ -6,5 +6,5 @@
Name: OIS
Description: Cross platform C++ Input Framework
Version: @OIS_VERSION@
-Libs: -L${libdir} -lOIS
+Libs: -L${libdir} -lOIS@OIS_POSTFIX@
Cflags: -I${includedir} -I${includedir}/ois
2 changes: 2 additions & 0 deletions ports/ois/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ vcpkg_from_github(
REF v1.5.1
SHA512 20598aef999a70900cb7f75ffaf62059acf8e811822971cb21986b5d25d28dacb79e4b4cf4770c70e00d3c55cdd01ef3e68a77c2dd148677784fc4df38891340
HEAD_REF master
PATCHES
0001_install_pkgconfig_win32.patch
)

vcpkg_cmake_configure(
Expand Down
2 changes: 2 additions & 0 deletions ports/ois/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{
"name": "ois",
"version": "1.5.1",
"port-version": 1,
"description": "Cross Platform Object Oriented Input Lib System. Meant to be very robust and compatible with many systems and operating systems.",
"homepage": "https://wgois.github.io/OIS/",
"license": "Zlib",
"supports": "!(arm | arm64 | uwp)",
"dependencies": [
{
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4946,7 +4946,7 @@
},
"ois": {
"baseline": "1.5.1",
"port-version": 0
"port-version": 1
},
"ompl": {
"baseline": "1.5.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/ois.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "79d79b0c5901492572044ad873cdf4df864accea",
"version": "1.5.1",
"port-version": 1
},
{
"git-tree": "05dc4bcc0372eaa7b8a86f89a268c5ef0c69c5bf",
"version": "1.5.1",
Expand Down

0 comments on commit 9a6b6da

Please sign in to comment.