increased version in cmake

improved doxygen build to be using the cmake values

CMakeLists.txt

@@ -74,7 +74,7 @@ set(PAGEDGEOMETRY_USER_DATA             "FALSE" CACHE BOOL "ability to attach us
 # some versioning things
 SET(LIB_MAJOR_VERSION "1")
 SET(LIB_MINOR_VERSION "1")
-SET(LIB_BUILD_VERSION "0")
+SET(LIB_BUILD_VERSION "1")
 SET(LIB_VERSION "${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION}.${LIB_BUILD_VERSION}")
 IF(NOT DEFINED LIB_INSTALL_DIR)
   SET(LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
@@ -130,4 +130,58 @@ add_subdirectory(source)
 
 if(PAGEDGEOMETRY_BUILD_SAMPLES)
 	add_subdirectory(examples)
-endif(PAGEDGEOMETRY_BUILD_SAMPLES)
+endif(PAGEDGEOMETRY_BUILD_SAMPLES)
+
+
+
+# cpack
+set(CPACK_PACKAGE_DESCRIPTION "PagedGeometry")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The PagedGeometry engine is an add-on to Ogre which provides highly optimized methods for rendering massive amounts of small meshes, covering a possibly infinite area.")
+set(CPACK_PACKAGE_NAME "pagedgeometry")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "pagedgeometry")
+set(CPACK_PACKAGE_CONTACT "support@rigsofrods.com")
+set(CPACK_PACKAGE_VENDOR "support@rigsofrods.com")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/zlib.txt")
+
+SET(CPACK_GENERATOR ZIP)
+IF(UNIX)
+  SET(CPACK_GENERATOR ${CPACK_GENERATOR};STGZ;TGZ)
+ENDIF(UNIX)
+IF(LINUX)
+SET(CPACK_GENERATOR ${CPACK_GENERATOR};DEB;RPM)
+ENDIF(LINUX)
+IF(MSVC)
+  SET(CPACK_GENERATOR ${CPACK_GENERATOR};NSIS)
+ENDIF(MSVC)
+IF(APPLE)
+  SET(CPACK_GENERATOR ${CPACK_GENERATOR};PackageMaker)
+ENDIF(APPLE)
+set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${LIB_VERSION}-${CMAKE_SYSTEM_PROCESSOR}")
+include(CPack)
+
+# doxygen stuff
+find_package(Doxygen)
+if (DOXYGEN_FOUND)
+	message("found doxygen, generating documentation")
+	# prepare doxygen configuration file
+	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/docs/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/docs/Doxyfile)
+	# add doxygen as target
+	add_custom_target(doxygen ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/docs/Doxyfile)
+
+	# cleanup $build/api-doc on "make clean"
+	set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES api-doc)
+
+	# add doxygen as dependency to doc-target
+	get_target_property(DOC_TARGET doc TYPE)
+	if(NOT DOC_TARGET)
+		add_custom_target(doc)
+	endif()
+	add_dependencies(doc doxygen)
+	install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docs/html/ DESTINATION doc/api)
+	# install man pages into packages, scope is now project root..
+	#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/api-doc/man/man3 DESTINATION share/man/man3/ )
+endif (DOXYGEN_FOUND)
+
+# other doc files
+set(DOC_FILES Contributors.txt zlib.txt GettingStarted.txt Todo.txt)
+install(FILES ${DOC_FILES} DESTINATION doc/)

Contributors.txt

@@ -0,0 +1,4 @@
+John Judnich - main author
+Erik Hjortsberg (erik.hjortsberg@iteam.se)
+Thomas Fischer (thomas@rigsofrods.com) - maintainer since 2010
+m2codegen@rambler.ru - optimizations and performance improvements, releases 1.1.1 RC1