这是indexloc提供的服务，不要输入任何密码
Skip to content

nlopt, libode: Fix includedir and libdir in cmake and pkgconfig files #27230

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

Merged
merged 2 commits into from
Nov 13, 2025
Merged

nlopt, libode: Fix includedir and libdir in cmake and pkgconfig files #27230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c104ed0
fix(main/nlopt): Fix includedir and libdir in cmake and pkgconfig files
Biswa96 Nov 13, 2025
af197cf
fix(main/libode): Fix includedir and libdir in cmake and pkgconfig files
Biswa96 Nov 13, 2025
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
22 changes: 22 additions & 0 deletions packages/libode/CMakeLists.txt.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -603,7 +603,7 @@
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/ode/src>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/ode/src/joints>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/ou/include>
- $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)

if(ODE_16BIT_INDICES)
@@ -759,8 +759,8 @@
string(REGEX REPLACE "/$" "" PACKAGE_RELATIVE_PATH "${PACKAGE_RELATIVE_PATH}")
set(prefix "\${pcfiledir}/${PACKAGE_RELATIVE_PATH}")
set(exec_prefix "\${prefix}")
-set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
-set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+set(libdir "\${exec_prefix}/lib")
+set(includedir "\${prefix}/include")
configure_file(ode.pc.in ode.pc @ONLY)
set(prefix "\$(cd \"\$(dirname \"\$0\")\"; pwd -P)/..")
configure_file(ode-config.in ode-config @ONLY)
2 changes: 1 addition & 1 deletion packages/libode/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ TERMUX_PKG_GROUPS="science"
TERMUX_PKG_LICENSE="BSD 3-Clause, LGPL-2.1"
TERMUX_PKG_MAINTAINER="Pooya Moradi <pvonmoradi@gmail.com>"
TERMUX_PKG_VERSION="0.16.6"
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL="https://bitbucket.org/odedevs/ode/downloads/ode-$TERMUX_PKG_VERSION.tar.gz"
TERMUX_PKG_SHA256=c91a28c6ff2650284784a79c726a380d6afec87ecf7a35c32a6be0c5b74513e8
TERMUX_PKG_BUILD_IN_SRC=true
Expand Down
11 changes: 11 additions & 0 deletions packages/nlopt/CMakeLists.txt.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -287,7 +287,7 @@
src/api)

get_target_property (NLOPT_PRIVATE_INCLUDE_DIRS ${nlopt_lib} INCLUDE_DIRECTORIES)
-target_include_directories (${nlopt_lib} INTERFACE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/api;${PROJECT_BINARY_DIR}>" "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+target_include_directories (${nlopt_lib} INTERFACE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/api;${PROJECT_BINARY_DIR}>" "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")

if (BUILD_SHARED_LIBS)
target_compile_definitions (${nlopt_lib} PUBLIC NLOPT_DLL)
2 changes: 1 addition & 1 deletion packages/nlopt/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Library for nonlinear optimization"
TERMUX_PKG_LICENSE="LGPL-2.1, MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="2.10.0"
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://github.com/stevengj/nlopt/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=506f83a9e778ad4f204446e99509cb2bdf5539de8beccc260a014bd560237be1
TERMUX_PKG_DEPENDS="libc++"
Expand Down
13 changes: 13 additions & 0 deletions packages/nlopt/cmake-NLoptConfig.cmake.in.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- a/cmake/NLoptConfig.cmake.in
+++ b/cmake/NLoptConfig.cmake.in
@@ -3,8 +3,8 @@

set (NLOPT_VERSION "@NLOPT_VERSION_STRING@")

-set (NLOPT_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/@NLOPT_INSTALL_INCLUDEDIR@")
-set (NLOPT_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/@NLOPT_INSTALL_LIBDIR@")
+set (NLOPT_INCLUDE_DIRS "@NLOPT_INSTALL_INCLUDEDIR@")
+set (NLOPT_LIBRARY_DIRS "@NLOPT_INSTALL_LIBDIR@")

# Allows loading NLOPT settings from another project
set (NLOPT_CONFIG_FILE "${CMAKE_CURRENT_LIST_FILE}")
10 changes: 10 additions & 0 deletions packages/nlopt/nlopt.pc.in.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- a/nlopt.pc.in
+++ b/nlopt.pc.in
@@ -1,6 +1,6 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-libdir=${exec_prefix}/@NLOPT_INSTALL_LIBDIR@
+libdir=${exec_prefix}/lib
includedir=${prefix}/include

Name: NLopt