← Back to branch summary

~azzar1/unity/fix-1028810

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: Andrea Azzarone
  • Date: 2012-08-22 13:14:18 UTC
  • mfrom: (2516.1.92 unity)
  • Revision ID: azzaronea@gmail.com-20120822131418-mrfwx82k39xnvl9e
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeLists.txt
8
8
#
9
9
set (PROJECT_NAME "unity")
10
10
set (UNITY_MAJOR 6)
11
 
set (UNITY_MINOR 0)
 
11
set (UNITY_MINOR 2)
12
12
set (UNITY_MICRO 0)
13
13
set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
14
14
set (UNITY_API_VERSION "6.0")
23
23
    set (UNITY_STANDALONE_LADD "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU")
24
24
endif ()
25
25
 
26
 
option (USE_MODERN_COMPIZ_GL "Use Modern Compiz GL API" OFF)
27
 
if (USE_MODERN_COMPIZ_GL)
28
 
        SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_MODERN_COMPIZ_GL")
29
 
endif (USE_MODERN_COMPIZ_GL)
30
 
 
31
26
if (BUILD_GLES)
32
 
        SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNUX_OPENGLES_20 -DUSE_GLES -DUSE_MODERN_COMPIZ_GL")
 
27
        SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNUX_OPENGLES_20 -DUSE_GLES")
33
28
endif (BUILD_GLES)
34
29
 
35
30
#
134
129
# Compiz Plugins
135
130
#
136
131
 
137
 
set (UNITY_PLUGIN_DEPS "compiz;nux-3.0>=3.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;unity-misc>=0.4.0;gconf-2.0;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;xfixes;unity-protocol-private>=5.93.1")
 
132
set (UNITY_PLUGIN_DEPS "compiz;nux-3.0>=3.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;unity-misc>=0.4.0;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;xfixes;unity-protocol-private>=5.95.1;libgeis")
138
133
# FIXME: unity-protocol-private shouldn't be there, but building of unityshell is just broken
139
 
set (UNITY_PROTOCOL_PRIVATE_DEPS "unity-protocol-private>=5.93.1")
 
134
set (UNITY_PROTOCOL_PRIVATE_DEPS "unity-protocol-private>=5.95.1")
140
135
 
141
136
find_package (PkgConfig)
142
137
pkg_check_modules (CACHED_UNITY_DEPS REQUIRED ${UNITY_PLUGIN_DEPS})