Skip to content

Commit

Permalink
Newer version of cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
wijagels committed Nov 27, 2016
1 parent fc91b57 commit 5175627
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ matrix:

before_install:
- sudo apt-add-repository -y ppa:canonical-qt5-edgers/ubuntu1204-qt5
- sudo add-apt-repository -y ppa:george-edison55/precise-backports
- sudo apt-get update -qq
- sudo apt-get install -y libopencv-dev qtdeclarative5-dev
- sudo apt-get install -y libopencv-dev qtdeclarative5-dev cmake cmake-data
script:
- cd qtapp
- mkdir build
Expand Down
18 changes: 9 additions & 9 deletions qtapp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,6 @@ else()
endif()
endif()


# Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON)

set(CMAKE_AUTOUIC ON)

# Find includes in corresponding build directories
set(CMAKE_INCLUDE_CURRENT_DIR ON)

if($ENV{USER} STREQUAL "nik")
set(OpenCV_DIR ~/opencv/build)
endif()
Expand All @@ -49,6 +40,15 @@ find_package(Qt5Widgets REQUIRED)
find_package(OpenCV REQUIRED)
find_package(CURL)


# Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON)

set(CMAKE_AUTOUIC ON)

# Find includes in corresponding build directories
set(CMAKE_INCLUDE_CURRENT_DIR ON)

add_executable(qtapp main.cpp mainwindow.cpp expandpath.cpp)
target_link_libraries(qtapp Qt5::Widgets)

Expand Down

0 comments on commit 5175627

Please sign in to comment.