|
 |
a7c9879 |
From 24dd58bc78d9e480fc24d4d762bd738fa0ef6956 Mon Sep 17 00:00:00 2001
|
|
|
a7c9879 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
a7c9879 |
Date: Wed, 6 Dec 2023 23:23:15 +0100
|
|
|
a7c9879 |
Subject: [PATCH 2/4] Fix install libpaths
|
|
|
a7c9879 |
|
|
|
a7c9879 |
---
|
|
|
a7c9879 |
src/bindings/csharp/CMakeLists.txt | 2 +-
|
|
|
a7c9879 |
src/bindings/octave/CMakeLists.txt | 2 +-
|
|
|
a7c9879 |
src/bindings/perl/CMakeLists.txt | 2 +-
|
|
|
a7c9879 |
src/bindings/ruby/CMakeLists.txt | 2 +-
|
|
|
a7c9879 |
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
a7c9879 |
|
|
|
a7c9879 |
diff --git a/src/bindings/csharp/CMakeLists.txt b/src/bindings/csharp/CMakeLists.txt
|
|
|
a7c9879 |
index c1d30c1014..d70d15dc38 100644
|
|
|
a7c9879 |
--- a/src/bindings/csharp/CMakeLists.txt
|
|
|
a7c9879 |
+++ b/src/bindings/csharp/CMakeLists.txt
|
|
|
a7c9879 |
@@ -213,7 +213,7 @@ add_custom_target(binding_csharp_swig ALL DEPENDS ${SWIG_DEPENDENCIES})
|
|
|
f82fbc8 |
#
|
|
|
f82fbc8 |
set(CSHAPR_PACKAGE_INSTALL_DIR)
|
|
|
f82fbc8 |
if (UNIX OR CYGWIN)
|
|
|
f82fbc8 |
- set(CSHAPR_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/mono/libsbmlcsP)
|
|
|
f82fbc8 |
+ set(CSHAPR_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/mono/libsbmlcsP)
|
|
|
f82fbc8 |
else()
|
|
|
f82fbc8 |
set(CSHAPR_PACKAGE_INSTALL_DIR ${MISC_PREFIX}bindings/csharp)
|
|
|
f82fbc8 |
endif()
|
|
|
a7c9879 |
diff --git a/src/bindings/octave/CMakeLists.txt b/src/bindings/octave/CMakeLists.txt
|
|
|
a7c9879 |
index 73dc18f552..fe5e4db926 100644
|
|
|
a7c9879 |
--- a/src/bindings/octave/CMakeLists.txt
|
|
|
a7c9879 |
+++ b/src/bindings/octave/CMakeLists.txt
|
|
|
a7c9879 |
@@ -81,7 +81,7 @@ set(OCTAVE_PACKAGE_INSTALL_DIR)
|
|
|
f82fbc8 |
if (UNIX OR CYGWIN)
|
|
|
f82fbc8 |
execute_process(COMMAND "${OCTAVE_CONFIG_EXECUTABLE}" -p CANONICAL_HOST_TYPE
|
|
|
f82fbc8 |
OUTPUT_VARIABLE OCTAVE_PLATFORM OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
|
f82fbc8 |
- set(OCTAVE_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/octave/site/oct/${OCTAVE_PLATFORM})
|
|
 |
74b97bb |
+ set(OCTAVE_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/octave/packages/SBML-${PACKAGE_VERSION})
|
|
|
f82fbc8 |
else()
|
|
|
f82fbc8 |
set(OCTAVE_PACKAGE_INSTALL_DIR ${MISC_PREFIX}bindings/octave)
|
|
|
f82fbc8 |
endif()
|
|
|
a7c9879 |
diff --git a/src/bindings/perl/CMakeLists.txt b/src/bindings/perl/CMakeLists.txt
|
|
|
a7c9879 |
index 8c6044717b..dd4cf8809d 100644
|
|
|
a7c9879 |
--- a/src/bindings/perl/CMakeLists.txt
|
|
|
a7c9879 |
+++ b/src/bindings/perl/CMakeLists.txt
|
|
|
a7c9879 |
@@ -232,7 +232,7 @@ Could not determine Perl version, please check the variable:
|
|
|
f82fbc8 |
string(REPLACE "'" "" PERL_PLATFORM ${PERL_PLATFORM})
|
|
|
f82fbc8 |
string(REPLACE ";" "" PERL_PLATFORM ${PERL_PLATFORM})
|
|
|
f82fbc8 |
string(REPLACE "archname=" "" PERL_PLATFORM ${PERL_PLATFORM})
|
|
|
f82fbc8 |
- set(PERL_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/perl5/site_perl/${PERL_VERSION}/${PERL_PLATFORM})
|
|
|
f82fbc8 |
+ set(PERL_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/perl5/vendor_perl)
|
|
|
a7c9879 |
set(PERL_PACKAGE_INSTALL_BIN_DIR ${PERL_PACKAGE_INSTALL_DIR}/auto/LibSBML)
|
|
|
f82fbc8 |
else()
|
|
|
f82fbc8 |
set(PERL_PACKAGE_INSTALL_DIR ${MISC_PREFIX}bindings/perl)
|
|
|
a7c9879 |
diff --git a/src/bindings/ruby/CMakeLists.txt b/src/bindings/ruby/CMakeLists.txt
|
|
|
a7c9879 |
index 1c1a3897b9..d6b1fb3f4e 100644
|
|
|
a7c9879 |
--- a/src/bindings/ruby/CMakeLists.txt
|
|
|
a7c9879 |
+++ b/src/bindings/ruby/CMakeLists.txt
|
|
|
a7c9879 |
@@ -177,7 +177,7 @@ set(RUBY_PACKAGE_INSTALL_DIR)
|
|
|
a7c9879 |
if (UNIX OR CYGWIN)
|
|
|
a7c9879 |
execute_process(COMMAND "${RUBY_EXECUTABLE}" -e "print RUBY_PLATFORM"
|
|
|
a7c9879 |
OUTPUT_VARIABLE RUBY_PLATFORM)
|
|
|
a7c9879 |
- set(RUBY_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/ruby/site_ruby/${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}/${RUBY_PLATFORM})
|
|
|
a7c9879 |
+ set(RUBY_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/ruby/vendor_ruby)
|
|
|
a7c9879 |
else()
|
|
|
a7c9879 |
set(RUBY_PACKAGE_INSTALL_DIR ${MISC_PREFIX}bindings/ruby)
|
|
|
a7c9879 |
endif()
|