Skip to content

Commit

Permalink
fix debug suffix
Browse files Browse the repository at this point in the history
  • Loading branch information
maz-1 committed Mar 8, 2022
1 parent fce04ef commit a39b94f
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 7 deletions.
28 changes: 23 additions & 5 deletions ports/ois/0001_install_pkgconfig_win32.patch
Original file line number Diff line number Diff line change
@@ -1,11 +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 10:35:36.235998300 +0800
@@ -255,7 +255,5 @@
+++ 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)
-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)
+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: 1 addition & 1 deletion ports/ois/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"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/",
"supports": "!(arm | arm64 | uwp)",
"license": "Zlib",
"supports": "!(arm | arm64 | uwp)",
"dependencies": [
{
"name": "vcpkg-cmake",
Expand Down
2 changes: 1 addition & 1 deletion versions/o-/ois.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"versions": [
{
"git-tree": "81da871c0f26427fd1612bdf027c8872bcab71b5",
"git-tree": "79d79b0c5901492572044ad873cdf4df864accea",
"version": "1.5.1",
"port-version": 1
},
Expand Down

0 comments on commit a39b94f

Please sign in to comment.