File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -39,8 +39,9 @@ matrix:
3939
4040before_install :
4141 - sudo apt-add-repository -y ppa:canonical-qt5-edgers/ubuntu1204-qt5
42+ - sudo add-apt-repository -y ppa:george-edison55/precise-backports
4243 - sudo apt-get update -qq
43- - sudo apt-get install -y libopencv-dev qtdeclarative5-dev
44+ - sudo apt-get install -y libopencv-dev qtdeclarative5-dev cmake cmake-data
4445script :
4546 - cd qtapp
4647 - mkdir build
Original file line number Diff line number Diff line change @@ -30,15 +30,6 @@ else()
3030 endif ()
3131endif ()
3232
33-
34- # Instruct CMake to run moc automatically when needed.
35- set (CMAKE_AUTOMOC ON )
36-
37- set (CMAKE_AUTOUIC ON )
38-
39- # Find includes in corresponding build directories
40- set (CMAKE_INCLUDE_CURRENT_DIR ON )
41-
4233if ($ENV{USER} STREQUAL "nik" )
4334set (OpenCV_DIR ~/opencv/build)
4435endif ()
@@ -49,6 +40,15 @@ find_package(Qt5Widgets REQUIRED)
4940find_package (OpenCV REQUIRED )
5041find_package (CURL )
5142
43+
44+ # Instruct CMake to run moc automatically when needed.
45+ set (CMAKE_AUTOMOC ON )
46+
47+ set (CMAKE_AUTOUIC ON )
48+
49+ # Find includes in corresponding build directories
50+ set (CMAKE_INCLUDE_CURRENT_DIR ON )
51+
5252add_executable (qtapp main.cpp mainwindow.cpp expandpath.cpp )
5353target_link_libraries (qtapp Qt5::Widgets )
5454
You can’t perform that action at this time.
0 commit comments