Skip to content

Commit ef654dd

Browse files
authored
Merge pull request #2054 from VCTLabs/perl-install-fix
make default perl install path respect CMAKE_INSTALL_PREFIX
2 parents 5b3b1d7 + f70f38e commit ef654dd

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,10 @@ message(STATUS " ")
463463
message(STATUS "Language bindings:")
464464
message(STATUS "python3 bindings: ${ENABLE_PYTHON3}")
465465
message(STATUS "perl bindings: ${ENABLE_PERL}")
466+
message(STATUS "perl vendorlib: ${PERL_VENDORLIB}")
467+
message(STATUS "perl vendorarch: ${PERL_VENDORARCH}")
468+
message(STATUS "perl privlib: ${PERL_PRIVLIB}")
469+
message(STATUS "perl archlib: ${PERL_ARCHLIB}")
466470
message(STATUS " ")
467471

468472
message(STATUS "Utilities:")

swig/perl/CMakeLists.txt

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
include(UseSWIG)
22
include(FindPerlLibs)
33

4+
string(SUBSTRING "${PERL_VERSION_STRING}" 0 4 PERL_VERSION_MINOR)
5+
6+
# process cmake vendor paths to respect install prefix, use as Linux defaults below
7+
if (NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
8+
STRING(REGEX REPLACE "^/usr/" "${CMAKE_INSTALL_PREFIX}/" PERL_VENDORARCH "${PERL_VENDORARCH}")
9+
STRING(REGEX REPLACE "^/usr/" "${CMAKE_INSTALL_PREFIX}/" PERL_VENDORLIB "${PERL_VENDORLIB}")
10+
endif()
11+
12+
message(STATUS "perl install libdir: ${PERL_VENDORARCH}")
13+
message(STATUS "perl install archdir: ${PERL_VENDORLIB}")
14+
415
set(CMAKE_SWIG_FLAGS "-module" "openscap_pm")
516
if (${CMAKE_VERSION} VERSION_LESS "3.8.0")
617
swig_add_module(openscap_pm perl5 ../openscap.i)
@@ -20,7 +31,7 @@ if (APPLE OR (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD"))
2031
DESTINATION ${CMAKE_INSTALL_DATADIR}/perl5/vendor_perl)
2132
else()
2233
install(TARGETS ${SWIG_MODULE_openscap_pm_REAL_NAME}
23-
DESTINATION ${PERL_VENDORLIB})
34+
DESTINATION ${PERL_VENDORARCH})
2435
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/openscap_pm.pm
25-
DESTINATION ${PERL_VENDORARCH})
36+
DESTINATION ${PERL_VENDORLIB})
2637
endif()

0 commit comments

Comments
 (0)