unify cmake format and skipped messages, prepare next tag

cginternals · Nov 1, 2014 · b88b9d1 · b88b9d1
1 parent fb74c44
commit b88b9d1
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(META_PROJECT_NAME        "globjects")
 set(META_PROJECT_DESCRIPTION "Strict OpenGL objects wrapper")
 set(META_VERSION_MAJOR       "0")
 set(META_VERSION_MINOR       "4")
-set(META_VERSION_PATCH       "0")
+set(META_VERSION_PATCH       "1")
 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/globjects/")

diff --git a/docs/doxygen/CMakeLists.txt b/docs/doxygen/CMakeLists.txt
@@ -39,6 +39,6 @@ if(DOXYGEN_FOUND)
 
 else()
 
-    message(STATUS "Disabled generation of doxygen documentation (missing doxygen).")
+    message("generate target documentation skipped: doxygen not found")
 
 endif()
diff --git a/source/examples/common/CMakeLists.txt b/source/examples/common/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 set(target ${EXAMPLE_COMMON})
-message(STATUS "Library ${target}")
+message(STATUS "Lib ${target} (used for examples)")
 
 # External libraries
 

diff --git a/source/examples/osg-example/CMakeLists.txt b/source/examples/osg-example/CMakeLists.txt
@@ -4,7 +4,7 @@ set(target osg-example)
 find_package(OpenSceneGraph COMPONENTS osgViewer osgDB  osgGA osgUtil QUIET)
 
 if (NOT OPENSCENEGRAPH_FOUND)
-    message(STATUS "Example ${target} (disabled - OSG not found)")
+    message("Example ${target} skipped: OSG not found")
     return()
 endif()
 

diff --git a/source/examples/qt-example/CMakeLists.txt b/source/examples/qt-example/CMakeLists.txt
@@ -17,7 +17,7 @@ find_package(Qt5Gui     5.1 QUIET)
 find_package(Qt5Widgets 5.1 QUIET)
 
 if (NOT Qt5Core_FOUND)
-    message(STATUS "Example ${target} (disabled - Qt5 not found)")
+    message("Example ${target} skipped: Qt5 not found")
     return()
 endif()
 

diff --git a/source/globjects/CMakeLists.txt b/source/globjects/CMakeLists.txt
@@ -2,12 +2,14 @@
 set(target globjects)
 message(STATUS "Lib ${target}")
 
+
 # External libraries
 
 find_package(OpenGL REQUIRED)
 find_package(GLM REQUIRED)
 find_package(GLBinding REQUIRED)
 
+
 # Includes
 
 include_directories(
@@ -20,16 +22,16 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
 
+
 # Libraries
 
 set(libs
 	${OPENGL_LIBRARIES}
     ${GLBINDING_LIBRARIES}
 )
 
-#
+
 # Compiler definitions
-#
 
 if (OPTION_BUILD_STATIC)
     add_definitions("-D${META_PROJECT_NAME_UPPER}_STATIC")
@@ -297,6 +299,7 @@ set_target_properties(${target}
     DEBUG_POSTFIX               "d${DEBUG_POSTFIX}"
     INCLUDE_PATH	            ${include_path})
 
+
 # Deployment
 
 # Library

diff --git a/source/tests/CMakeLists.txt b/source/tests/CMakeLists.txt
@@ -21,7 +21,7 @@ if(OPTION_BUILD_TESTS)
     find_package(GMOCK)
     find_package(GTEST)
     if(NOT GMOCK_FOUND OR NOT GTEST_FOUND)
-        message(STATUS "Disabled tests (missing gmock and/or gtest)")
+        message("Tests skipped: gmock and/or gtest not found")
     endif()
 endif()
 

diff --git a/source/tests/globjects-test/CMakeLists.txt b/source/tests/globjects-test/CMakeLists.txt
@@ -2,9 +2,8 @@
 set(target globjects-test)
 message(STATUS "Test ${target}")
 
-#
+
 # Includes
-#
 
 include_directories(
 
@@ -15,29 +14,26 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/source/globjects/include
 )
 
-#
+
 # Libraries
-#
 
 set(libs
     ${GMOCK_LIBRARIES}
     ${GTEST_LIBRARIES}
     globjects
 )
 
-#
+
 # Sources
-#
 
 set(sources
     main.cpp
     ref_ptr_test.cpp
     Referenced_test.cpp
 )
 
-#
+
 # Build executable
-#
 
 add_executable(${target} ${sources})