head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.32 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.30 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.28 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.26 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.24 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.22 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.20 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.18 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.16 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.14 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.12 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.10 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.8 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.6 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.4 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.2 pkgsrc-2022Q2-base:1.1; locks; strict; comment @# @; 1.1 date 2022.05.30.16.00.14; author adam; state Exp; branches; next ; commitid f3UehKuM4vV916GD; desc @@ 1.1 log @lensfun: updated to 0.3.3 v0.3.3 New maintenance release for the 0.3.x branch. Includes all new cameras and lenses. @ text @$NetBSD$ Find correct Python executable. --- apps/CMakeLists.txt.orig 2022-02-22 20:49:04.000000000 +0000 +++ apps/CMakeLists.txt @@@@ -21,8 +21,8 @@@@ ENDIF(INSTALL_HELPER_SCRIPTS) # Inspired by http://bloerg.net/2012/11/10/cmake-and-distutils.html -FIND_PROGRAM(PYTHON "python3") -IF(PYTHON) +find_package (Python3 COMPONENTS Interpreter) +IF(Python3_FOUND) SET(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in") SET(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/setup.py") SET(DEPS_IN "${CMAKE_CURRENT_SOURCE_DIR}/lensfun/__init__.py.in") @@@@ -33,7 +33,7 @@@@ IF(PYTHON) CONFIGURE_FILE(${DEPS_IN} ${DEPS}) ADD_CUSTOM_COMMAND(OUTPUT ${OUTPUT} - COMMAND ${PYTHON} ${SETUP_PY} build + COMMAND ${Python3_EXECUTABLE} ${SETUP_PY} build COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT} DEPENDS ${DEPS_IN}) @@@@ -42,5 +42,5 @@@@ IF(PYTHON) IF(NOT DEFINED SETUP_PY_INSTALL_PREFIX) SET(SETUP_PY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") ENDIF() - INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=\$ENV{DESTDIR}${SETUP_PY_INSTALL_PREFIX})") + INSTALL(CODE "execute_process(COMMAND ${Python3_EXECUTABLE} ${SETUP_PY} install --root=\$ENV{DESTDIR})") ENDIF(PYTHON) @