adjust cmake format, provide nsis graphics, prepare next patch

cginternals · Nov 1, 2014 · fc40202 · fc40202
1 parent f11a8fb
commit fc40202
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 19 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(META_PROJECT_NAME        "glbinding")
 set(META_PROJECT_DESCRIPTION "OpenGL C++ Binding")
 set(META_VERSION_MAJOR       "1")
 set(META_VERSION_MINOR       "0")
-set(META_VERSION_PATCH       "2")
+set(META_VERSION_PATCH       "3")
 set(META_VERSION             "${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}")
 set(META_AUTHOR_ORGANIZATION "hpicgs group")
 set(META_AUTHOR_DOMAIN       "https://github.com/hpicgs/glbinding")

diff --git a/packages/nsis.bmp b/packages/nsis.bmp
diff --git a/packages/pack-glbinding.cmake b/packages/pack-glbinding.cmake
@@ -31,6 +31,7 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
     get_filename_component(CPACK_PATH ${CMAKE_COMMAND} PATH)
     set(CPACK_COMMAND "${CPACK_PATH}/cpack")
 
+
     # Package project
 
     set(project_name ${META_PROJECT_NAME})   # Name of package project

diff --git a/packages/win.bmp b/packages/win.bmp
diff --git a/source/examples/callbacks/CMakeLists.txt b/source/examples/callbacks/CMakeLists.txt
@@ -1,9 +1,8 @@
 
 set(target callbacks)
 
-#
+
 # External libraries
-#
 
 find_package(OpenGL REQUIRED)
 find_package(GLFW QUIET)
@@ -15,9 +14,8 @@ endif()
 
 message(STATUS "Example ${target}")
 
-#
+
 # Includes
-#
 
 include_directories(
     ${OPENGL_INCLUDE_DIR}
@@ -30,27 +28,24 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-#
+
 # Libraries
-#
 
 set(libs
     ${OPENGL_LIBRARIES}
     ${GLFW_LIBRARY}
     glbinding
 )
 
-#
+
 # Compiler definitions
-#
 
 if (OPTION_BUILD_STATIC)
     add_definitions("-DGLBINDING_STATIC")
 endif()
 
-#
+
 # Sources
-#
 
 set(comparison_path ../comparison)
 
@@ -61,9 +56,8 @@ set(sources
 	${comparison_path}/gltest_data.inl
 )
 
-#
+
 # Build executable
-#
 
 add_executable(${target} ${sources})
 
@@ -80,9 +74,8 @@ set_target_properties(${target}
     LINK_FLAGS_RELEASE          "${DEFAULT_LINKER_FLAGS_RELEASE}"
     DEBUG_POSTFIX               "d${DEBUG_POSTFIX}")
 
-#
+
 # Deployment
-#
 
 install(TARGETS ${target} COMPONENT examples
     RUNTIME DESTINATION ${INSTALL_EXAMPLES}

diff --git a/source/examples/comparison/CMakeLists.txt b/source/examples/comparison/CMakeLists.txt
@@ -1,6 +1,7 @@
 
 set(target comparison)
 
+
 # External libraries
 
 find_package(OpenGL REQUIRED)
@@ -19,6 +20,7 @@ endif()
 
 message(STATUS "Example ${target}")
 
+
 # Includes
 
 include_directories(
@@ -33,6 +35,7 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+
 # Libraries
 
 set(libs
@@ -42,12 +45,14 @@ set(libs
     glbinding
 )
 
+
 # Compiler definitions
 
 if (OPTION_BUILD_STATIC)
     add_definitions("-DGLBINDING_STATIC")
 endif()
 
+
 # Sources
 
 set(sources
@@ -66,6 +71,7 @@ set(sources
     Timer.h
 )
 
+
 # Build executable
 
 add_executable(${target} ${sources})
@@ -83,6 +89,7 @@ set_target_properties(${target}
     LINK_FLAGS_RELEASE          "${DEFAULT_LINKER_FLAGS_RELEASE}"
     DEBUG_POSTFIX               "d${DEBUG_POSTFIX}")
 
+
 # Deployment
 
 install(TARGETS ${target} COMPONENT examples

diff --git a/source/examples/cubescape-qt/CMakeLists.txt b/source/examples/cubescape-qt/CMakeLists.txt
@@ -1,6 +1,7 @@
 
 set(target cubescape-qt)
 
+
 # Qt5
 
 # good resource: http://www.kdab.com/using-cmake-with-qt-5/
@@ -10,6 +11,7 @@ if(MSVC)
     cmake_policy(SET CMP0020 NEW)
 endif()
 
+
 # External libraries
 
 find_package(Qt5OpenGL  5.1 QUIET)
@@ -31,6 +33,7 @@ set(AUTOMOC_MOC_OPTIONS PROPERTIES FOLDER CMakeAutomocTargets)
 # What we do not want is automocs beside the project -> http://www.cmake.org/Bug/view.php?id=13688
 set_property(GLOBAL PROPERTY AUTOMOC_FOLDER CMakeAutomocTargets)
 
+
 # Includes
 
 include_directories(
@@ -44,18 +47,21 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
+
 # Libraries
 
 set(libs
     glbinding
 )
 
+
 # Compiler definitions
 
 if (OPTION_BUILD_STATIC)
     add_definitions("-DGLBINDING_STATIC")
 endif()
 
+
 # Sources
 
 set(cubscape_path ../cubescape)
@@ -82,10 +88,12 @@ set(uis
     Viewer.ui
 )
 
+
 # UI Files
 
 qt5_wrap_ui(compiled_ui_files ${uis})
 
+
 # Build executable
 
 add_executable(${target} ${sources} ${compiled_ui_files})
@@ -107,6 +115,7 @@ set_target_properties(${target}
     LINK_FLAGS_RELEASE          "${DEFAULT_LINKER_FLAGS_RELEASE}"
     DEBUG_POSTFIX               "d${DEBUG_POSTFIX}")
 
+
 # Deployment
 
 install(TARGETS ${target} COMPONENT examples

diff --git a/source/examples/cubescape/CMakeLists.txt b/source/examples/cubescape/CMakeLists.txt
@@ -1,6 +1,7 @@
 
 set(target cubescape)
 
+
 # External libraries
 
 find_package(OpenGL REQUIRED)
@@ -13,6 +14,7 @@ endif()
 
 message(STATUS "Example ${target}")
 
+
 # Includes
 
 include_directories(
@@ -26,6 +28,7 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+
 # Libraries
 
 set(libs
@@ -34,12 +37,14 @@ set(libs
     glbinding
 )
 
+
 # Compiler definitions
 
 if (OPTION_BUILD_STATIC)
     add_definitions("-DGLBINDING_STATIC")
 endif()
 
+
 # Sources
 
 set(sources
@@ -52,6 +57,7 @@ set(sources
     RawFile.h
 )
 
+
 # Build executable
 
 add_executable(${target} ${sources})
@@ -69,6 +75,7 @@ set_target_properties(${target}
     LINK_FLAGS_RELEASE          "${DEFAULT_LINKER_FLAGS_RELEASE}"
     DEBUG_POSTFIX               "d${DEBUG_POSTFIX}")
 
+
 # Deployment
 
 install(TARGETS ${target} COMPONENT examples

diff --git a/source/examples/functions/CMakeLists.txt b/source/examples/functions/CMakeLists.txt
@@ -1,6 +1,7 @@
 
 set(target functions)
 
+
 # External libraries
 
 find_package(OpenGL REQUIRED)
@@ -13,6 +14,7 @@ endif()
 
 message(STATUS "Example ${target}")
 
+
 # Includes
 
 include_directories(
@@ -26,6 +28,7 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+
 # Libraries
 
 set(libs
@@ -34,18 +37,21 @@ set(libs
     glbinding
 )
 
+
 # Compiler definitions
 
 if (OPTION_BUILD_STATIC)
     add_definitions("-DGLBINDING_STATIC")
 endif()
 
+
 # Sources
 
 set(sources
     main.cpp
 )
 
+
 # Build executable
 
 add_executable(${target} ${sources})
@@ -63,6 +69,7 @@ set_target_properties(${target}
     LINK_FLAGS_RELEASE          "${DEFAULT_LINKER_FLAGS_RELEASE}"
     DEBUG_POSTFIX               "d${DEBUG_POSTFIX}")
 
+
 # Deployment
 
 install(TARGETS ${target} COMPONENT examples

diff --git a/source/examples/meta/CMakeLists.txt b/source/examples/meta/CMakeLists.txt
@@ -2,10 +2,12 @@
 set(target meta)
 message(STATUS "Example ${target}")
 
+
 # External libraries
 
 find_package(OpenGL REQUIRED)
 
+
 # Includes
 
 include_directories(
@@ -18,13 +20,15 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+
 # Libraries
 
 set(libs
     ${OPENGL_LIBRARIES}
     glbinding
 )
 
+
 # Compiler definitions
 
 if (OPTION_BUILD_STATIC)
@@ -38,12 +42,14 @@ if (OPTION_GL_BY_STRINGS)
     add_definitions("-DGL_BY_STRINGS")
 endif()
 
+
 # Sources
 
 set(sources
     main.cpp
 )
 
+
 # Build executable
 
 add_executable(${target} ${sources})
@@ -61,6 +67,7 @@ set_target_properties(${target}
     LINK_FLAGS_RELEASE          "${DEFAULT_LINKER_FLAGS_RELEASE}"
     DEBUG_POSTFIX               "d${DEBUG_POSTFIX}")
 
+
 # Deployment
 
 install(TARGETS ${target} COMPONENT examples