Merge pull request #689 from ayounes-nviso/cmake-min-version

fix: increase min cmake version
Tencent · Dec 6, 2018 · c93e672 · c93e672
2 parents a6679ed + b35d65a
commit c93e672
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,9 @@ set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation
 endif()
 message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
 
-cmake_minimum_required(VERSION 2.8.10)
+# This is the minimum cmake version supporting the modern cmake OpenMP module below
+# modern cmake requires 3.0 anyway and android cmake requires 3.6
+cmake_minimum_required(VERSION 3.1.3)
 
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE release CACHE STRING "Choose the type of build" FORCE)

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -10,7 +10,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src)
 
 add_executable(ncnn2mem ncnn2mem.cpp)
 
-target_link_libraries(ncnn2mem ncnn)
+target_link_libraries(ncnn2mem PRIVATE ncnn)
 
 if(COVERAGE)
     target_link_libraries(ncnn2mem PRIVATE --coverage)