File tree 8 files changed +15
-16
lines changed
8 files changed +15
-16
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ set(META_PROJECT_NAME "globjects")
8
8
set (META_PROJECT_DESCRIPTION "Strict OpenGL objects wrapper" )
9
9
set (META_VERSION_MAJOR "0" )
10
10
set (META_VERSION_MINOR "4" )
11
- set (META_VERSION_PATCH "0 " )
11
+ set (META_VERSION_PATCH "1 " )
12
12
set (META_VERSION "${META_VERSION_MAJOR} .${META_VERSION_MINOR} .${META_VERSION_PATCH} " )
13
13
set (META_AUTHOR_ORGANIZATION "hpicgs group" )
14
14
set (META_AUTHOR_DOMAIN "https://github.com/hpicgs/globjects/" )
Original file line number Diff line number Diff line change @@ -39,6 +39,6 @@ if(DOXYGEN_FOUND)
39
39
40
40
else ()
41
41
42
- message (STATUS "Disabled generation of doxygen documentation (missing doxygen). " )
42
+ message ("generate target documentation skipped: doxygen not found " )
43
43
44
44
endif ()
Original file line number Diff line number Diff line change 1
1
2
2
set (target ${EXAMPLE_COMMON} )
3
- message (STATUS "Library ${target} " )
3
+ message (STATUS "Lib ${target} (used for examples) " )
4
4
5
5
# External libraries
6
6
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ set(target osg-example)
4
4
find_package (OpenSceneGraph COMPONENTS osgViewer osgDB osgGA osgUtil QUIET )
5
5
6
6
if (NOT OPENSCENEGRAPH_FOUND)
7
- message (STATUS "Example ${target} (disabled - OSG not found) " )
7
+ message ("Example ${target} skipped: OSG not found" )
8
8
return ()
9
9
endif ()
10
10
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ find_package(Qt5Gui 5.1 QUIET)
17
17
find_package (Qt5Widgets 5.1 QUIET )
18
18
19
19
if (NOT Qt5Core_FOUND)
20
- message (STATUS "Example ${target} (disabled - Qt5 not found) " )
20
+ message ("Example ${target} skipped: Qt5 not found" )
21
21
return ()
22
22
endif ()
23
23
Original file line number Diff line number Diff line change 2
2
set (target globjects)
3
3
message (STATUS "Lib ${target} " )
4
4
5
+
5
6
# External libraries
6
7
7
8
find_package (OpenGL REQUIRED)
8
9
find_package (GLM REQUIRED)
9
10
find_package (GLBinding REQUIRED)
10
11
12
+
11
13
# Includes
12
14
13
15
include_directories (
@@ -20,16 +22,16 @@ include_directories(
20
22
${CMAKE_CURRENT_SOURCE_DIR} /include
21
23
)
22
24
25
+
23
26
# Libraries
24
27
25
28
set (libs
26
29
${OPENGL_LIBRARIES}
27
30
${GLBINDING_LIBRARIES}
28
31
)
29
32
30
- #
33
+
31
34
# Compiler definitions
32
- #
33
35
34
36
if (OPTION_BUILD_STATIC)
35
37
add_definitions ("-D${META_PROJECT_NAME_UPPER} _STATIC" )
@@ -297,6 +299,7 @@ set_target_properties(${target}
297
299
DEBUG_POSTFIX "d${DEBUG_POSTFIX} "
298
300
INCLUDE_PATH ${include_path} )
299
301
302
+
300
303
# Deployment
301
304
302
305
# Library
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ if(OPTION_BUILD_TESTS)
21
21
find_package (GMOCK)
22
22
find_package (GTEST)
23
23
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 " )
25
25
endif ()
26
26
endif ()
27
27
Original file line number Diff line number Diff line change 2
2
set (target globjects-test )
3
3
message (STATUS "Test ${target} " )
4
4
5
- #
5
+
6
6
# Includes
7
- #
8
7
9
8
include_directories (
10
9
@@ -15,29 +14,26 @@ include_directories(
15
14
${CMAKE_SOURCE_DIR} /source /globjects/include
16
15
)
17
16
18
- #
17
+
19
18
# Libraries
20
- #
21
19
22
20
set (libs
23
21
${GMOCK_LIBRARIES}
24
22
${GTEST_LIBRARIES}
25
23
globjects
26
24
)
27
25
28
- #
26
+
29
27
# Sources
30
- #
31
28
32
29
set (sources
33
30
main.cpp
34
31
ref_ptr_test.cpp
35
32
Referenced_test.cpp
36
33
)
37
34
38
- #
35
+
39
36
# Build executable
40
- #
41
37
42
38
add_executable (${target} ${sources} )
43
39
You can’t perform that action at this time.
0 commit comments