All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] CMakeList.txt: make python optional
@ 2021-08-30 15:04 Matteo Croce
  2021-08-30 18:57 ` Arnaldo Carvalho de Melo
  0 siblings, 1 reply; 2+ messages in thread
From: Matteo Croce @ 2021-08-30 15:04 UTC (permalink / raw)
  To: dwarves; +Cc: Arnaldo Carvalho de Melo

From: Matteo Croce <mcroce@microsoft.com>

ostra-cg, which requires python, is installed in the destination dir.
Make it optional for embedded distributions which doesn't have the
python interpreter available.

Signed-off-by: Matteo Croce <mcroce@microsoft.com>
---
 CMakeLists.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4140574..8523bce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,6 +61,7 @@ find_package(DWARF REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(argp REQUIRED)
 find_package(obstack REQUIRED)
+find_package(Python3 QUIET)
 
 # make sure git submodule(s) are checked out
 find_package(Git QUIET)
@@ -185,8 +186,10 @@ install(FILES dwarves.h dwarves_emit.h dwarves_reorganize.h
 	      elfcreator.h elf_symtab.h hash.h libctf.h
 	DESTINATION ${CMAKE_INSTALL_PREFIX}/include/dwarves/)
 install(FILES man-pages/pahole.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1/)
-install(PROGRAMS ostra/ostra-cg DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+if(Python3_FOUND)
+	install(PROGRAMS ostra/ostra-cg DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+	install(FILES ostra/python/ostra.py DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dwarves/runtime/python)
+endif()
 install(PROGRAMS btfdiff fullcircle DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-install(FILES ostra/python/ostra.py DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dwarves/runtime/python)
 install(FILES lib/Makefile lib/ctracer_relay.c lib/ctracer_relay.h lib/linux.blacklist.cu
 	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dwarves/runtime)
-- 
2.31.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] CMakeList.txt: make python optional
  2021-08-30 15:04 [PATCH] CMakeList.txt: make python optional Matteo Croce
@ 2021-08-30 18:57 ` Arnaldo Carvalho de Melo
  0 siblings, 0 replies; 2+ messages in thread
From: Arnaldo Carvalho de Melo @ 2021-08-30 18:57 UTC (permalink / raw)
  To: Matteo Croce; +Cc: dwarves

Em Mon, Aug 30, 2021 at 05:04:40PM +0200, Matteo Croce escreveu:
> From: Matteo Croce <mcroce@microsoft.com>
> 
> ostra-cg, which requires python, is installed in the destination dir.
> Make it optional for embedded distributions which doesn't have the
> python interpreter available.

Thanks, applied.

- Arnaldo
 
> Signed-off-by: Matteo Croce <mcroce@microsoft.com>
> ---
>  CMakeLists.txt | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 4140574..8523bce 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -61,6 +61,7 @@ find_package(DWARF REQUIRED)
>  find_package(ZLIB REQUIRED)
>  find_package(argp REQUIRED)
>  find_package(obstack REQUIRED)
> +find_package(Python3 QUIET)
>  
>  # make sure git submodule(s) are checked out
>  find_package(Git QUIET)
> @@ -185,8 +186,10 @@ install(FILES dwarves.h dwarves_emit.h dwarves_reorganize.h
>  	      elfcreator.h elf_symtab.h hash.h libctf.h
>  	DESTINATION ${CMAKE_INSTALL_PREFIX}/include/dwarves/)
>  install(FILES man-pages/pahole.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1/)
> -install(PROGRAMS ostra/ostra-cg DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
> +if(Python3_FOUND)
> +	install(PROGRAMS ostra/ostra-cg DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
> +	install(FILES ostra/python/ostra.py DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dwarves/runtime/python)
> +endif()
>  install(PROGRAMS btfdiff fullcircle DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
> -install(FILES ostra/python/ostra.py DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dwarves/runtime/python)
>  install(FILES lib/Makefile lib/ctracer_relay.c lib/ctracer_relay.h lib/linux.blacklist.cu
>  	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dwarves/runtime)
> -- 
> 2.31.1

-- 

- Arnaldo

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-08-30 18:57 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-30 15:04 [PATCH] CMakeList.txt: make python optional Matteo Croce
2021-08-30 18:57 ` Arnaldo Carvalho de Melo

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.