← Back to branch summary

~abreu-alexandre/oxide/content-script-injection-main-world

« back to all changes in this revision

Viewing changes to qt/CMakeLists.txt

  • Committer: Chris Coulson
  • Date: 2014-04-16 08:34:12 UTC
  • Revision ID: chris.coulson@canonical.com-20140416083412-gius2u4pev28qcnu
Also make ENABLE_OXIDEQMLSCENE the default

Show diffs side-by-side

added added

removed removed

Lines of Context:
qt/CMakeLists.txt
48
48
    PROPERTIES IMPORTED_LOCATION ${CHROMIUM_LIB_DIR}/${OXIDE_CORELIB_UNVERSIONED})
49
49
 
50
50
add_subdirectory(quick)
51
 
if(ENABLE_OXIDEQMLSCENE)
 
51
if(NOT DEFINED ENABLE_OXIDEQMLSCENE OR ENABLE_OXIDEQMLSCENE EQUAL 1)
52
52
  add_subdirectory(qmlrunner)
53
53
endif()
54
54
if(ENABLE_TESTS)
104
104
      -P ${CMAKE_CURRENT_SOURCE_DIR}/build/scripts/package.cmake
105
105
    DEPENDS stage-quick stage-run-qmlscene
106
106
    COMMENT "Creating compressed archive")
107
 
if(ENABLE_OXIDEQMLSCENE)
 
107
if(NOT DEFINED ENABLE_OXIDEQMLSCENE OR ENABLE_OXIDEQMLSCENE EQUAL 1)
108
108
  add_dependencies(package stage-oxideqmlscene)
109
109
endif()