← Back to branch summary

~vthompson/ubuntu-weather-app/reboot-lock-portrait

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: Tarmac
  • Author(s): Victor Thompson
  • Date: 2015-08-09 16:38:29 UTC
  • mfrom: (85.1.2 reboot-remove-cpp-flag)
  • Revision ID: tarmac-20150809163829-y7zrq2pyjd5iau8z
* Remove C++ flag from CMakeLists.txt
* Show README files in QtCreator.

Approved by Ubuntu Phone Apps Jenkins Bot, Andrew Hayzen.

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeLists.txt
11
11
endif()
12
12
 
13
13
set (UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
14
 
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
15
14
 
16
15
find_package(Qt5Core REQUIRED)
17
16
find_package(Qt5Qml REQUIRED)
97
96
add_subdirectory(po)
98
97
add_subdirectory(tests)
99
98
 
 
99
# make the qml files visible on qtcreator
 
100
file(GLOB QML_JS_FILES
 
101
    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
 
102
    *.qml *.js README* *.txt)
 
103
          
 
104
add_custom_target(com_ubuntu_weather_QMLFiles DEPENDS ubuntu-weather-app.qml SOURCES ${QML_JS_FILES})
 
105
          
100
106
# TODO: Add custom target for autopilot and run.
101
107