summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominique Leuenberger <dimstar@opensuse.org>2022-06-20 16:05:11 +0200
committerGitHub <noreply@github.com>2022-06-20 16:05:11 +0200
commit6b9aff168d7538f585e8a0edce40d97728dc379d (patch)
tree3bd7efeff8623184537b12e64528a4ec07bbb606
parent43eb39d22369cac5844b8b6ff470168d4f72c5b3 (diff)
parent806e1d21a3940672ced9c1cfeb81aeec8bf0b463 (diff)
downloadlibproxy-git-6b9aff168d7538f585e8a0edce40d97728dc379d.tar.gz
Merge pull request #175 from Vogtinator/perlfix
Fix perl testing and enable it by default
-rw-r--r--bindings/perl/lib/CMakeLists.txt2
-rw-r--r--bindings/perl/src/CMakeLists.txt2
-rw-r--r--bindings/perl/t/CMakeLists.txt3
3 files changed, 4 insertions, 3 deletions
diff --git a/bindings/perl/lib/CMakeLists.txt b/bindings/perl/lib/CMakeLists.txt
index 9856627..7c36e51 100644
--- a/bindings/perl/lib/CMakeLists.txt
+++ b/bindings/perl/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
-add_custom_target(PMlibproxy ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Libproxy.pm ${CMAKE_BINARY_DIR}/perl/blib/lib/Libproxy.pm)
+add_custom_target(PMlibproxy ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Libproxy.pm ${CMAKE_BINARY_DIR}/perl/Net/Libproxy.pm)
install( FILES Libproxy.pm DESTINATION ${PX_PERL_ARCH}/Net )
diff --git a/bindings/perl/src/CMakeLists.txt b/bindings/perl/src/CMakeLists.txt
index 05176c4..29e656d 100644
--- a/bindings/perl/src/CMakeLists.txt
+++ b/bindings/perl/src/CMakeLists.txt
@@ -9,7 +9,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Libproxy.c
set(Libproxy_LIB_SRCS Libproxy.c)
-set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/perl/blib/arch/auto/Net)
+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/perl/auto/Net/Libproxy)
add_library(PLlibproxy SHARED ${Libproxy_LIB_SRCS})
set(PLlibproxy_LIB_DEPENDENCIES libproxy pthread)
diff --git a/bindings/perl/t/CMakeLists.txt b/bindings/perl/t/CMakeLists.txt
index 8007124..cb18fd3 100644
--- a/bindings/perl/t/CMakeLists.txt
+++ b/bindings/perl/t/CMakeLists.txt
@@ -1 +1,2 @@
-add_custom_target(test prove -b ${CMAKE_CURRENT_SOURCE_DIR})
+add_test(NAME perl COMMAND prove -b ${CMAKE_CURRENT_SOURCE_DIR})
+set_property(TEST perl APPEND PROPERTY ENVIRONMENT "PERL5LIB=${CMAKE_BINARY_DIR}/perl")