On Sat, Jul 9, 2011 at 3:14 AM, Chris Foster <[email protected]> wrote:
> Sounds good, I'm addressing the install directory structure to make it more
> standard and configurable, just need to find the time to finish it off. If
> you
> could send your version of the pugixml cmake file that would be handy so that
> I
> can get OIIO building with it.
Patch attached.
>
> Larry, about the docs, which parts do you think we need to install by default?
> Currently we install:
>
> * openimageio.pdf
> * Doxygen html documentation
> * CLA-INDIVIDUAL CLA-CORPORATE
> * LICENSE, CHANGES, INSTALL
> * And now the new man pages (unix only)
>
> IMO there's no point installing some of the more development-centric stuff
> like
> the CLAs because OIIO developers will presumably be using the repository
> version of the source.
>
> I propose we install:
>
> * openimageio.pdf
> * Doxygen html documentation
> * LICENSE, CHANGES
> * man pages (unix only)
Makes sense to me. We really don't need INSTALL :) If you're running
make install then presumably you already know what you're doing and we
certainly don't need it for the RPM.
> It seems to me that there's two overall structures for the install directory
> (1) for installation into the unix standard system locations and
> (2) for installation into oiio's own directory.
> I'll try to make sensible defaults for these two variants. (2) is basically
> what we have now, and apart from being relevant for studio packaging it makes
> sense on windows. (1) can be the default from-source build if you're not
> using
> the makefiles.
>
> Sound ok?
Works for me. One thing that would be nice is to use LIB_INSTALL_DIR,
which seems pretty standard. That would take care of where to put the
library (/usr/lib{,64}, /usr/local/lib{,64}, etc.).
Since pretty much all of my packaging experience is with RPM I'm not
sure what the best way to handle documentation is, but currently I
have to copy "doc" back to the build directory so I can pass it to the
%doc macro so it get's installed to the correct location
(/usr/share/doc/OpenImageIO-0.10.0/*). I wonder if a simple cmake
option, something like INSTALL_DOCS:BOOL=ON could be defaulted so I
can turn it off for RPM builds.
Thanks,
Richard
--- scripts/CMakeLists.txt.orig 2010-09-20 22:14:28.000000000 -0500
+++ scripts/CMakeLists.txt 2011-07-08 13:44:29.630913408 -0500
@@ -1,5 +1,19 @@
project(pugixml)
+cmake_minimum_required(VERSION 2.6)
+set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared instead of static library")
+
set(SOURCES ../src/pugixml.hpp ../src/pugiconfig.hpp ../src/pugixml.cpp)
-add_library(pugixml STATIC ${SOURCES})
+if(BUILD_SHARED_LIBS)
+ add_library(pugixml SHARED ${SOURCES})
+else()
+ add_library(pugixml STATIC ${SOURCES})
+endif()
+
+set_target_properties(pugixml
+ PROPERTIES
+ VERSION 1.0
+ SOVERSION 1.0
+ )
+
_______________________________________________
Oiio-dev mailing list
[email protected]
http://lists.openimageio.org/listinfo.cgi/oiio-dev-openimageio.org
