Skip to content

Commit ef8b620

Browse files
author
Nesterov Alexander
authored
Merge pull request #5 from allnes/branch_for_modifications
Added OpenCV dependency. Test functionality (For Linux).
2 parents 6e0de3d + b5feb83 commit ef8b620

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ before_install:
1414

1515
install:
1616
- sudo apt-get install libcr-dev mpich2 mpich2-doc
17+
- sudo apt-get install libopencv-*
1718

1819
script:
1920
- mkdir build

CMakeLists.txt

+10
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,14 @@ if( MPI_FOUND )
77
include_directories( ${MPI_INCLUDE_PATH} )
88
endif( MPI_FOUND )
99

10+
############ test functionality ############
11+
if ( NOT MSVC )
12+
find_package( OpenCV REQUIRED )
13+
if( OpenCV_FOUND )
14+
message(STATUS "OpenCV - Found")
15+
include_directories( ${OpenCV_INCLUDE_DIRS} )
16+
endif( OpenCV_FOUND )
17+
endif( NOT MSVC )
18+
############################################
19+
1020
add_subdirectory(modules)

modules/test_task/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if( MPI_COMPILE_FLAGS )
88
endif( MPI_COMPILE_FLAGS )
99

1010
if( MPI_LINK_FLAGS )
11-
set_target_properties( ${PROJECT_NAME} PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}" )
11+
set_target_properties( ${PROJECT_NAME} PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}" )
1212
endif( MPI_LINK_FLAGS )
1313

1414
target_link_libraries( ${PROJECT_NAME} ${MPI_LIBRARIES} )

0 commit comments

Comments
 (0)