diff --git a/CMakeLists.txt b/CMakeLists.txt index 88d313f1b..12c59af17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ set(NOTCURSES_SHARE ${CMAKE_INSTALL_PREFIX}/share/notcurses) ###################### USER-SELECTABLE OPTIONS ########################### option(DFSG_BUILD "DFSG build (no non-free media/code)" OFF) -option(USE_DOXYGEN "Build HTML cross reference with doxygen" ON) +option(USE_DOXYGEN "Build HTML cross reference with doxygen" OFF) option(USE_FFMPEG "Disable FFmpeg image/video support (recommended)" ON) option(USE_NETWORK "Allow cargo to use the network" OFF) option(USE_PANDOC "Build man pages and HTML reference with pandoc" ON) @@ -560,6 +560,7 @@ if(${USE_PYTHON}) OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/build/pytimestamp" COMMAND + "${Python3_EXECUTABLE}" ${SETUP_PY} egg_info && "${Python3_EXECUTABLE}" ${SETUP_PY} build_ext -L ${CMAKE_CURRENT_BINARY_DIR} -b ${CMAKE_CURRENT_BINARY_DIR}/python -t${CMAKE_CURRENT_BINARY_DIR}/python && "${Python3_EXECUTABLE}" ${SETUP_PY} build_py DEPENDS @@ -673,7 +674,7 @@ install(FILES DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man3 ) -install(FILES src/pydemo/notcurses-pydemo DESTINATION bin) +install(PROGRAMS src/pydemo/notcurses-pydemo DESTINATION bin) install(TARGETS notcurses-demo DESTINATION bin) install(TARGETS notcurses-input DESTINATION bin) install(TARGETS notcurses-ncreel DESTINATION bin) @@ -698,7 +699,7 @@ if(${USE_PYTHON}) install( CODE "execute_process( COMMAND - ${Python3_EXECUTABLE} ${SETUP_PY} install --root=${DESTDIR} --prefix=${CMAKE_INSTALL_PREFIX} --single-version-externally-managed --optimize=1 --skip-build + ${Python3_EXECUTABLE} ${SETUP_PY} install --root=/ --prefix=${CMAKE_INSTALL_PREFIX} --optimize=1 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/python )" diff --git a/debian/control b/debian/control index c385f8806..5794139f2 100644 --- a/debian/control +++ b/debian/control @@ -5,9 +5,7 @@ Build-Depends: cmake, debhelper-compat (= 12), dh-python (>= 4.20191017), dh-sequence-python3, - dia, doctest-dev, - doxygen (>= 1.8.16), graphviz (>= 2.42.2), libavformat-dev (>= 7:4.2.1), libavutil-dev (>= 7:4.2.1),