Re: [Picviz] Picviz 0.6 is out!
Few more remarks then. :)
The project name in libpicviz-0.6/CMakeLists.txt is set to "LIBPICVIZ",
which in some places expands to paths like this one:
/usr/lib/LIBPICVIZ/libpicvizoutpngcairo.so
I'm not sure what's the best cmake tweak to fix this, but a suggestion
is in the patch.
libev is included in the sources but it seems that it's available from
package repositories (at least for Fedora and Debian). I haven't looked
deeper whether it's some modified version.
picviz-parsers don't have a tarball release so far.
Tomas
On 07/20/2009 10:39 PM, Sebastien Tricaud wrote:
Thank you very much Tomas, this kind of bug tracking is very valuable,
especially with a patch.
Applied in current svn, a new minor release will appear soon.
++ Sebastien.
On Mon, Jul 20, 2009 at 5:51 PM, Tomas Heinrich wrote:
Hi,
I think there's a small bug in the python bindings build script that
prevents the bindings from being built if libpicviz is not already
installed. Patch attached.
Tomas
diff -up libpicviz-0.6.cmake/CMakeLists.txt.orig
libpicviz-0.6.cmake/CMakeLists.txt
--- libpicviz-0.6.cmake/CMakeLists.txt.orig 2009-07-21 17:23:03.0
+0200
+++ libpicviz-0.6.cmake/CMakeLists.txt 2009-07-21 18:33:59.0 +0200
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.6)
-project(LIBPICVIZ)
+project(libpicviz)
INCLUDE(CheckIncludeFile)
INCLUDE(CheckFunctionExists)
@@ -48,7 +48,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR
DESTINATION ${LIB_INSTALL_DIR}/pkgconfig/ )
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LIBPICVIZ_SOURCE_DIR}/cmake)
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake)
FIND_PACKAGE(FLEX REQUIRED)
FIND_PACKAGE(BISON REQUIRED)
#FIND_PACKAGE(PCRE REQUIRED)
diff -up libpicviz-0.6.cmake/gnulib/glthread/CMakeLists.txt.orig
libpicviz-0.6.cmake/gnulib/glthread/CMakeLists.txt
--- libpicviz-0.6.cmake/gnulib/glthread/CMakeLists.txt.orig 2009-07-21
17:23:41.0 +0200
+++ libpicviz-0.6.cmake/gnulib/glthread/CMakeLists.txt 2009-07-21
17:26:21.0 +0200
@@ -1,4 +1,4 @@
-include_directories(${LIBPICVIZ_SOURCE_DIR}/gnulib/ ${LIBPICVIZ_SOURCE_DIR})
+include_directories(${PROJECT_SOURCE_DIR}/gnulib/ ${PROJECT_SOURCE_DIR})
add_library(glthread STATIC cond.c lock.c thread.c threadlib.c tls.c)
diff -up libpicviz-0.6.cmake/src/CMakeLists.txt.orig
libpicviz-0.6.cmake/src/CMakeLists.txt
--- libpicviz-0.6.cmake/src/CMakeLists.txt.orig 2009-07-21 17:23:06.0
+0200
+++ libpicviz-0.6.cmake/src/CMakeLists.txt 2009-07-21 17:29:52.0
+0200
@@ -1,14 +1,14 @@
add_subdirectory(plugins)
#add_subdirectory(bindings)
-include_directories(${LIBPICVIZ_SOURCE_DIR}/src/include ${PCRE_INCLUDE_DIR}
${LIBPICVIZ_SOURCE_DIR}/gnulib/glthread ${LIBPICVIZ_SOURCE_DIR}/libev)
+include_directories(${PROJECT_SOURCE_DIR}/src/include ${PCRE_INCLUDE_DIR}
${PROJECT_SOURCE_DIR}/gnulib/glthread ${PROJECT_SOURCE_DIR}/libev)
link_directories(
- ${LIBPICVIZ_BINARY_DIR}/libev
+ ${PROJECT_BINARY_DIR}/libev
)
#set(CMAKE_SHARED_LINKER_FLAGS "-lm -lfl -ly")
-#link_directories(${LIBPICVIZ_BINARY_DIR}/
${LIBPICVIZ_BINARY_DIR}/gnulib/glthread ${LIBPICVIZ_BINARY_DIR}/libev)
+#link_directories(${PROJECT_BINARY_DIR}/ ${PROJECT_BINARY_DIR}/gnulib/glthread
${PROJECT_BINARY_DIR}/libev)
IF(PCRE_FOUND)
INCLUDE_DIRECTORIES(AFTER ${PCRE_INCLUDE_DIR})
@@ -17,19 +17,19 @@ ENDIF(PCRE_FOUND)
# Parser
-BISON_TARGET(picviz ${LIBPICVIZ_SOURCE_DIR}/src/pgdl-parser.y
${LIBPICVIZ_BINARY_DIR}/src/pgdl-parser.c)
-FLEX_TARGET(picviz ${LIBPICVIZ_SOURCE_DIR}/src/pgdl-lexer.l
${LIBPICVIZ_BINARY_DIR}/src/pgdl-lexer.c)
+BISON_TARGET(picviz ${PROJECT_SOURCE_DIR}/src/pgdl-parser.y
${PROJECT_BINARY_DIR}/src/pgdl-parser.c)
+FLEX_TARGET(picviz ${PROJECT_SOURCE_DIR}/src/pgdl-lexer.l
${PROJECT_BINARY_DIR}/src/pgdl-lexer.c)
# Filter
-BISON_TARGET(picviz ${LIBPICVIZ_SOURCE_DIR}/src/filter.yac.y
${LIBPICVIZ_BINARY_DIR}/src/filter-parser.c)
-FLEX_TARGET(picviz ${LIBPICVIZ_SOURCE_DIR}/src/filter.lex.l
${LIBPICVIZ_BINARY_DIR}/src/filter-lexer.c)
+BISON_TARGET(picviz ${PROJECT_SOURCE_DIR}/src/filter.yac.y
${PROJECT_BINARY_DIR}/src/filter-parser.c)
+FLEX_TARGET(picviz ${PROJECT_SOURCE_DIR}/src/filter.lex.l
${PROJECT_BINARY_DIR}/src/filter-lexer.c)
add_library(picviz SHARED axis.c axisplot.c correlation.c debug.c real-time.c
filter.c image.c learn.c line.c plugins.c engine.c picviz-hash.c picviz-init.c
picviz-pcre.c properties.c render.c values-mapping.c variable.c utils.c
filter-parser.c filter-lexer.c pgdl-parser.c pgdl-lexer.c prop-color.c)
set_target_properties(picviz PROPERTIES SOVERSION 2)
-#target_link_libraries(picviz "-lm -ldl -L${LIBPICVIZ_BINARY_DIR}/libev -lev")
-target_link_libraries(picviz "-lm -ldl -L${LIBPICVIZ_BINARY_DIR}/libev/ -lev")
+#target_link_libraries(picviz "-lm -ldl -L${PROJECT_BINARY_DIR}/libev -lev")
+target_link_libraries(picviz "-lm -ldl -L${PROJECT_BINARY_DIR}/libev/ -lev")
install(TARGETS picviz LIBRARY DESTINATION
Re: [Picviz] Picviz 0.6 is out!
Thank you very much Tomas, this kind of bug tracking is very valuable,
especially with a patch.
Applied in current svn, a new minor release will appear soon.
++ Sebastien.
On Mon, Jul 20, 2009 at 5:51 PM, Tomas Heinrich wrote:
> Hi,
>
> I think there's a small bug in the python bindings build script that
> prevents the bindings from being built if libpicviz is not already
> installed. Patch attached.
>
> Tomas
>
> diff -up libpicviz-0.6/src/bindings/python/setup.py.orig
> libpicviz-0.6/src/bindings/python/setup.py
> --- libpicviz-0.6/src/bindings/python/setup.py.orig 2009-07-20
> 17:06:20.0 +0200
> +++ libpicviz-0.6/src/bindings/python/setup.py 2009-07-20
> 17:17:51.0 +0200
> @@ -7,7 +7,7 @@ modulepcv = Extension('picviz',
> ('MINOR_VERSION', '6')],
> include_dirs = ['../../include/'],
> libraries = ['picviz','pcre'],
> - library_dirs = ['../../../../build/src/libpicviz/'],
> + library_dirs = ['../../../build/src/'],
> sources = ['py-picviz.c', 'py-picviz_util.c',
> 'py-picviz_image.c', 'py-picviz_axes.c', 'py-picviz_lines.c',
> 'py-picviz_pgdl.c'])
>
> setup (name = 'Picviz',
>
> ___
> Picviz mailing list
> Picviz@wallinfire.net
> http://www.wallinfire.net/cgi-bin/mailman/listinfo/picviz
>
>
___
Picviz mailing list
Picviz@wallinfire.net
http://www.wallinfire.net/cgi-bin/mailman/listinfo/picviz
Re: [Picviz] Picviz 0.6 is out!
Hi,
I think there's a small bug in the python bindings build script that
prevents the bindings from being built if libpicviz is not already
installed. Patch attached.
Tomas
diff -up libpicviz-0.6/src/bindings/python/setup.py.orig
libpicviz-0.6/src/bindings/python/setup.py
--- libpicviz-0.6/src/bindings/python/setup.py.orig 2009-07-20
17:06:20.0 +0200
+++ libpicviz-0.6/src/bindings/python/setup.py 2009-07-20 17:17:51.0
+0200
@@ -7,7 +7,7 @@ modulepcv = Extension('picviz',
('MINOR_VERSION', '6')],
include_dirs = ['../../include/'],
libraries = ['picviz','pcre'],
-library_dirs = ['../../../../build/src/libpicviz/'],
+library_dirs = ['../../../build/src/'],
sources = ['py-picviz.c', 'py-picviz_util.c',
'py-picviz_image.c', 'py-picviz_axes.c', 'py-picviz_lines.c',
'py-picviz_pgdl.c'])
setup (name = 'Picviz',
___
Picviz mailing list
Picviz@wallinfire.net
http://www.wallinfire.net/cgi-bin/mailman/listinfo/picviz
