"Jonas M. Gastal" <[email protected]> writes:
> This patch changes the include dir for pkg-config and cmake to be the full
> path(i.e.: /usr/include/qjson instead of /usr/include). There is no point in
> adding the default include dir as the include dir for QJson, and it's a pain
> to have to do "#include <qjson/serializer.h>" instead of "#include
> <serializer.h>".
>
> Regards,
> Gastal
>
> P.S. Please CC me, I'm not on the list.
>
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index efbcaab..0172ec4 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -40,7 +40,7 @@ INCLUDE( ${QT_USE_FILE} )
> #add extra search paths for libraries and includes
> SET (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
> SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING
> "Directory where lib will install")
> -SET (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The
> directory the headers are installed in")
> +SET (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/qjson" CACHE PATH
> "The directory the headers are installed in")
> SET (CMAKECONFIG_INSTALL_DIR
> "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}" CACHE PATH "Directory where
> to install QJSONConfig.cmake")
>
> set(QJSON_LIB_MAJOR_VERSION "0")
This will make the headers be installed into
${CMAKE_INSTALL_PREFIX}/include/qjson/qjson, so the problem is not going
away.
If you adjust the patch and do set INCLUDE_INSTALL_DIR to
${CMAKE_INSTALL_PREFIX}/include/qjson and install the headers there,
code which currently uses #include <qjson/foo.h> will break. I'm not
sure the project has a policy against that, but this would be a
source-incompatible change.
------------------------------------------------------------------------------
Learn Windows Azure Live! Tuesday, Dec 13, 2011
Microsoft is holding a special Learn Windows Azure training event for
developers. It will provide a great way to learn Windows Azure and what it
provides. You can attend the event by watching it streamed LIVE online.
Learn more at http://p.sf.net/sfu/ms-windowsazure
_______________________________________________
QJson-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/qjson-devel
