← Back to branch summary

~kalikiana/midori/cmake

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: Christian Dywan
  • Date: 2013-09-01 17:04:53 UTC
  • Revision ID: christian.dywan@canonical.com-20130901170453-xz3aic5vbxv8vdse
Drop unique package check and defines

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeLists.txt
122
122
    set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/webkitgtk-3.0.vapi")
123
123
    pkg_check_modules(OPTS_GTK
124
124
                      gcr-3>=2.32
125
 
                      unique-3.0>=0.9
126
125
                      )
127
 
    if (OPTS_GTK_unique-3.0_VERSION)
128
 
        add_definitions("-DHAVE_UNIQUE")
129
 
        add_definitions("-DUNIQUE_VERSION=\"${OPTS_GTK_unique-3.0_VERSION}\"")
130
 
    endif ()
131
126
    add_definitions("-DGCR_VERSION=\"${OPTS_GTK_gcr-3_VERSION}\"")
132
127
    set(VALAFLAGS ${VALAFLAGS} "-D;HAVE_GTK3")
133
128
elseif (HALF_BRO_INCOM_WEBKIT2)
142
137
    add_definitions("-DWEBKIT_VERSION=\"${DEPS_GTK_webkit2gtk-3.0_VERSION}\"")
143
138
    set(PKGS ${PKGS} gtk+-3.0)
144
139
    set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/webkit2gtk-3.0.vapi")
 
140
    # Always pass >1 module, otherwise we get different variable names
145
141
    pkg_check_modules(OPTS_GTK
 
142
                      gtk+-3.0>=3.0.0
146
143
                      gcr-3>=2.32
147
 
                      unique-3.0>=0.9
148
144
                      )
149
 
    if (OPTS_GTK_unique-3.0_VERSION)
150
 
        add_definitions("-DHAVE_UNIQUE")
151
 
        add_definitions("-DUNIQUE_VERSION=\"${OPTS_GTK_unique-3.0_VERSION}\"")
152
 
    endif ()
153
145
    add_definitions("-DGCR_VERSION=\"${OPTS_GTK_gcr-3_VERSION}\"")
154
146
    set(VALAFLAGS ${VALAFLAGS} "-D;HAVE_GTK3")
155
147
    set(VALAFLAGS ${VALAFLAGS} "-D;HAVE_WEBKIT2")
163
155
    add_definitions("-DWEBKIT_VERSION=\"${DEPS_GTK_webkit-1.0_VERSION}\"")
164
156
    set(PKGS ${PKGS} gtk+-2.0)
165
157
    set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/webkitgtk-3.0.vapi")
166
 
    # Always pass >1 module, otherwise we get different variable names
167
 
    pkg_check_modules(OPTS_GTK
168
 
                      gtk+-2.0>=2.24.0
169
 
                      unique-1.0>=0.9
170
 
                      )
171
 
    if (OPTS_GTK_unique-1.0_VERSION)
172
 
        add_definitions("-DHAVE_UNIQUE")
173
 
        add_definitions("-DUNIQUE_VERSION=\"${OPTS_GTK_unique-1.0_VERSION}\"")
174
 
    endif ()
175
158
    add_definitions("-DGCR_VERSION=\"No\"")
176
159
endif ()
177
160