From 618d2e4f1527ae962c90d0af6a466e56059b594c Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 29 Apr 2010 15:16:58 +0100 Subject: [PATCH 1/3] Updated file date --- glm/gtc/quaternion.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp index a9f9fa4b..1b531b0a 100644 --- a/glm/gtc/quaternion.hpp +++ b/glm/gtc/quaternion.hpp @@ -2,7 +2,7 @@ // OpenGL Mathematics Copyright (c) 2005 - 2009 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2009-05-21 -// Updated : 2009-06-04 +// Updated : 2010-04-29 // Licence : This source is under MIT License // File : glm/gtc/quaternion.hpp /////////////////////////////////////////////////////////////////////////////////////////////////// From e306f9f66a505973a07c796f84b21e807f211373 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 29 Apr 2010 15:18:06 +0100 Subject: [PATCH 2/3] Fixed CMake project --- CMakeLists.txt | 11 ++++++++++ doc/CMakeLists.txt | 10 +++++++++ glm/CMakeLists.txt | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 CMakeLists.txt create mode 100644 doc/CMakeLists.txt create mode 100644 glm/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..4317eb25 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 2.6 FATAL_ERROR) +cmake_policy(VERSION 2.6) + +project(glm) + +add_definitions(-D_CRT_SECURE_NO_WARNINGS) + +add_subdirectory(glm) + + + diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt new file mode 100644 index 00000000..6d9f918b --- /dev/null +++ b/doc/CMakeLists.txt @@ -0,0 +1,10 @@ +set(NAME glm-doc) + +file(GLOB ROOT_CPP src/*.cpp) +file(GLOB ROOT_XML src/*.xml) +file(GLOB ROOT_XSL src/*.xsl) + +source_group("XML Files" FILES ${ROOT_XML}) +source_group("XSL Files" FILES ${ROOT_XSL}) + +add_executable(${NAME} ${ROOT_CPP} ${ROOT_XML} ${ROOT_XSL}) diff --git a/glm/CMakeLists.txt b/glm/CMakeLists.txt new file mode 100644 index 00000000..8cf58cdc --- /dev/null +++ b/glm/CMakeLists.txt @@ -0,0 +1,51 @@ +set(NAME glm) + +file(GLOB ROOT_SOURCE *.cpp) +file(GLOB ROOT_INLINE *.inl) +file(GLOB ROOT_HEADER *.hpp) + +file(GLOB_RECURSE CORE_SOURCE ./core/*.cpp) +file(GLOB_RECURSE CORE_INLINE ./core/*.inl) +file(GLOB_RECURSE CORE_HEADER ./core/*.hpp) + +file(GLOB_RECURSE GTC_SOURCE ./gtc/*.cpp) +file(GLOB_RECURSE GTC_INLINE ./gtc/*.inl) +file(GLOB_RECURSE GTC_HEADER ./gtc/*.hpp) + +file(GLOB_RECURSE GTX_SOURCE ./gtx/*.cpp) +file(GLOB_RECURSE GTX_INLINE ./gtx/*.inl) +file(GLOB_RECURSE GTX_HEADER ./gtx/*.hpp) + +file(GLOB_RECURSE IMG_SOURCE ./img/*.cpp) +file(GLOB_RECURSE IMG_INLINE ./img/*.inl) +file(GLOB_RECURSE IMG_HEADER ./img/*.hpp) + +file(GLOB_RECURSE VIRTREV_SOURCE ./virtrev/*.cpp) +file(GLOB_RECURSE VIRTREV_INLINE ./virtrev/*.inl) +file(GLOB_RECURSE VIRTREV_HEADER ./virtrev/*.hpp) + +source_group("Core Files" FILES ${CORE_SOURCE}) +source_group("Core Files" FILES ${CORE_INLINE}) +source_group("Core Files" FILES ${CORE_HEADER}) +source_group("GTC Files" FILES ${GTC_SOURCE}) +source_group("GTC Files" FILES ${GTC_INLINE}) +source_group("GTC Files" FILES ${GTC_HEADER}) +source_group("GTX Files" FILES ${GTX_SOURCE}) +source_group("GTX Files" FILES ${GTX_INLINE}) +source_group("GTX Files" FILES ${GTX_HEADER}) +source_group("IMG Files" FILES ${IMG_SOURCE}) +source_group("IMG Files" FILES ${IMG_INLINE}) +source_group("IMG Files" FILES ${IMG_HEADER}) +source_group("VIRTREV Files" FILES ${VIRTREV_SOURCE}) +source_group("VIRTREV Files" FILES ${VIRTREV_INLINE}) +source_group("VIRTREV Files" FILES ${VIRTREV_HEADER}) + +include_directories(..) + +add_executable(${NAME} + ${ROOT_SOURCE} ${ROOT_INLINE} ${ROOT_HEADER} + ${CORE_SOURCE} ${CORE_INLINE} ${CORE_HEADER} + ${GTC_SOURCE} ${GTC_INLINE} ${GTC_HEADER} + ${GTX_SOURCE} ${GTX_INLINE} ${GTX_HEADER} + ${IMG_SOURCE} ${IMG_INLINE} ${IMG_HEADER} + ${VIRTREV_SOURCE} ${VIRTREV_INLINE} ${VIRTREV_HEADER}) From be9652818e6fbbdeae3439588fdf59a824517e34 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 29 Apr 2010 15:20:29 +0100 Subject: [PATCH 3/3] Fixed CMake project --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc46d193..e0007705 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,6 @@ add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_subdirectory(glm) add_subdirectory(doc) -add_subdirectory(test) +