Skip to content

Commit b88b9d1

Browse files
committedNov 1, 2014
unify cmake format and skipped messages, prepare next tag
1 parent fb74c44 commit b88b9d1

File tree

8 files changed

+15
-16
lines changed

8 files changed

+15
-16
lines changed
 

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set(META_PROJECT_NAME "globjects")
88
set(META_PROJECT_DESCRIPTION "Strict OpenGL objects wrapper")
99
set(META_VERSION_MAJOR "0")
1010
set(META_VERSION_MINOR "4")
11-
set(META_VERSION_PATCH "0")
11+
set(META_VERSION_PATCH "1")
1212
set(META_VERSION "${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}")
1313
set(META_AUTHOR_ORGANIZATION "hpicgs group")
1414
set(META_AUTHOR_DOMAIN "https://github.com/hpicgs/globjects/")

‎docs/doxygen/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ if(DOXYGEN_FOUND)
3939

4040
else()
4141

42-
message(STATUS "Disabled generation of doxygen documentation (missing doxygen).")
42+
message("generate target documentation skipped: doxygen not found")
4343

4444
endif()

‎source/examples/common/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
set(target ${EXAMPLE_COMMON})
3-
message(STATUS "Library ${target}")
3+
message(STATUS "Lib ${target} (used for examples)")
44

55
# External libraries
66

‎source/examples/osg-example/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set(target osg-example)
44
find_package(OpenSceneGraph COMPONENTS osgViewer osgDB osgGA osgUtil QUIET)
55

66
if (NOT OPENSCENEGRAPH_FOUND)
7-
message(STATUS "Example ${target} (disabled - OSG not found)")
7+
message("Example ${target} skipped: OSG not found")
88
return()
99
endif()
1010

‎source/examples/qt-example/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ find_package(Qt5Gui 5.1 QUIET)
1717
find_package(Qt5Widgets 5.1 QUIET)
1818

1919
if (NOT Qt5Core_FOUND)
20-
message(STATUS "Example ${target} (disabled - Qt5 not found)")
20+
message("Example ${target} skipped: Qt5 not found")
2121
return()
2222
endif()
2323

‎source/globjects/CMakeLists.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
set(target globjects)
33
message(STATUS "Lib ${target}")
44

5+
56
# External libraries
67

78
find_package(OpenGL REQUIRED)
89
find_package(GLM REQUIRED)
910
find_package(GLBinding REQUIRED)
1011

12+
1113
# Includes
1214

1315
include_directories(
@@ -20,16 +22,16 @@ include_directories(
2022
${CMAKE_CURRENT_SOURCE_DIR}/include
2123
)
2224

25+
2326
# Libraries
2427

2528
set(libs
2629
${OPENGL_LIBRARIES}
2730
${GLBINDING_LIBRARIES}
2831
)
2932

30-
#
33+
3134
# Compiler definitions
32-
#
3335

3436
if (OPTION_BUILD_STATIC)
3537
add_definitions("-D${META_PROJECT_NAME_UPPER}_STATIC")
@@ -297,6 +299,7 @@ set_target_properties(${target}
297299
DEBUG_POSTFIX "d${DEBUG_POSTFIX}"
298300
INCLUDE_PATH ${include_path})
299301

302+
300303
# Deployment
301304

302305
# Library

‎source/tests/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if(OPTION_BUILD_TESTS)
2121
find_package(GMOCK)
2222
find_package(GTEST)
2323
if(NOT GMOCK_FOUND OR NOT GTEST_FOUND)
24-
message(STATUS "Disabled tests (missing gmock and/or gtest)")
24+
message("Tests skipped: gmock and/or gtest not found")
2525
endif()
2626
endif()
2727

‎source/tests/globjects-test/CMakeLists.txt

+4-8
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
set(target globjects-test)
33
message(STATUS "Test ${target}")
44

5-
#
5+
66
# Includes
7-
#
87

98
include_directories(
109

@@ -15,29 +14,26 @@ include_directories(
1514
${CMAKE_SOURCE_DIR}/source/globjects/include
1615
)
1716

18-
#
17+
1918
# Libraries
20-
#
2119

2220
set(libs
2321
${GMOCK_LIBRARIES}
2422
${GTEST_LIBRARIES}
2523
globjects
2624
)
2725

28-
#
26+
2927
# Sources
30-
#
3128

3229
set(sources
3330
main.cpp
3431
ref_ptr_test.cpp
3532
Referenced_test.cpp
3633
)
3734

38-
#
35+
3936
# Build executable
40-
#
4137

4238
add_executable(${target} ${sources})
4339

0 commit comments

Comments
 (0)
Please sign in to comment.