Renamed opencv packages

willyd · Oct 12, 2016 · a172f51 · a172f51
1 parent 13ac286
commit a172f51
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/build_v120_x64.cmd b/build_v120_x64.cmd
@@ -22,7 +22,7 @@ cmake -G Ninja ^
       -D PROTOBUF_BUILD_SHARED_LIBS:BOOL=OFF ^
       -D OPENBLAS_BUILD_SHARED_LIBS:BOOL=ON ^
       -D SNAPPY_BUILD_SHARED_LIBS:BOOL=OFF ^
-      ..\
+      %~dp0
 :: build
 cmake --build .
 popd
diff --git a/build_v140_x64.cmd b/build_v140_x64.cmd
@@ -2,8 +2,9 @@
 if NOT EXIST build_v140_x64 (
 mkdir build_v140_x64
 )
+
 pushd build_v140_x64
-:: Setup the environement for VS 2013 x64
+:: Setup the environement for VS 2015 x64
 call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" amd64
 :: configure
 :: Build all packages
@@ -21,7 +22,7 @@ cmake -G Ninja ^
       -D PROTOBUF_BUILD_SHARED_LIBS:BOOL=OFF ^
       -D OPENBLAS_BUILD_SHARED_LIBS:BOOL=ON ^
       -D SNAPPY_BUILD_SHARED_LIBS:BOOL=OFF ^
-      ..\
+      %~dp0
 :: build
 cmake --build .
 popd
diff --git a/packages/boost/CMakeLists.txt b/packages/boost/CMakeLists.txt
@@ -125,6 +125,5 @@ set(Boost_USE_STATIC_RUNTIME ${Boost_USE_STATIC_RUNTIME} CACHE BOOL \"\")
     endforeach()
 
     add_custom_target(${PROJECT_NAME})
-    add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_targets} ) #${${PROJECT_NAME}_install_include})
-    # Consuming projects need to use hdf5-shared, etc as libraries to link to
+    add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_targets})
 endif()
diff --git a/packages/opencv/CMakeLists.txt b/packages/opencv/CMakeLists.txt
@@ -102,6 +102,7 @@ set(OpenCV_STATIC ${OpenCV_STATIC} CACHE BOOL \"\")
         ExternalProject_Add(
             ${PROJECT_NAME}_download_contrib
             URL  "https://github.com/opencv/opencv_contrib/archive/3.1.0.tar.gz"
+            DOWNLOAD_NAME opencv-contrib-3.1.0.zip
             DOWNLOAD_DIR ${CB_DOWNLOAD_DIR}
             CONFIGURE_COMMAND ""
             BUILD_COMMAND ""
@@ -150,7 +151,8 @@ set(OpenCV_STATIC ${OpenCV_STATIC} CACHE BOOL \"\")
 
     ExternalProject_Add(
         ${PROJECT_NAME}_download
-        URL  "https://sourceforge.net/projects/opencvlibrary/files/opencv-unix/3.1.0/opencv-3.1.0.zip"
+        URL  "https://github.com/opencv/opencv/archive/3.1.0.zip"
+        DOWNLOAD_NAME opencv-3.1.0.zip
         DOWNLOAD_DIR ${CB_DOWNLOAD_DIR}
         PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different
                       "${CMAKE_CURRENT_SOURCE_DIR}/patches/CMakeListsPatch.txt"