[incubator-mxnet] 12/16: attempt to fix CI

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

marcoabreu pushed a commit to branch devel-arm
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git

commit 914d1635612a9867171552b76d6411c5d238b8c7
Author: Pedro Larroy <pe...@gmail.com>
AuthorDate: Thu Jun 7 09:54:55 2018 +0000

    attempt to fix CI
---
 CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e39836..8a1765a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -658,14 +658,15 @@ if(USE_OPENCV AND OpenCV_VERSION_MAJOR GREATER 2)
   if(MSVC)
     target_link_libraries(im2rec mxnet)
   else()
-    target_link_libraries(im2rec ${BEGIN_WHOLE_ARCHIVE} mxnet_static ${END_WHOLE_ARCHIVE}
+    target_link_libraries(im2rec ${BEGIN_WHOLE_ARCHIVE} mxnet_static ${END_WHOLE_ARCHIVE})
+  endif()
+  target_link_libraries(im2rec
     ${mxnet_LINKER_LIBS}
     ${OpenCV_LIBS}
     dmlc
     ${nnvm_LINKER_LIBS}
     ${pslite_LINKER_LIBS}
     )
-  endif()
 else()
     message(WARNING "OpenCV_VERSION_MAJOR: ${OpenCV_VERSION_MAJOR}, version 3 with imgcodecs \
     is required for im2rec, im2rec will not be available")

-- 
To stop receiving notification emails like this one, please contact
marcoabreu@apache.org.