mirror of https://github.com/microsoft/vcpkg.git
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index f3d1d4785d..e17b084ad2 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1,10 +1,4 @@
|
|
-IF(APPLE)
|
|
- CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)
|
|
- CMAKE_POLICY(VERSION 2.8.12)
|
|
-ELSE()
|
|
- CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
|
|
- CMAKE_POLICY(VERSION 2.8)
|
|
-ENDIF()
|
|
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
|
|
|
|
SET(CMAKE_MODULE_PATH
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
|
|
diff --git a/lib/TH/CMakeLists.txt b/lib/TH/CMakeLists.txt
|
|
index 7db876be41..66b5f49d84 100644
|
|
--- a/lib/TH/CMakeLists.txt
|
|
+++ b/lib/TH/CMakeLists.txt
|
|
@@ -1,10 +1,5 @@
|
|
cmake_minimum_required(VERSION 2.6)
|
|
|
|
-# avoid some cmake warnings
|
|
-IF(POLICY CMP0026)
|
|
- CMAKE_POLICY(SET CMP0026 OLD)
|
|
-ENDIF()
|
|
-
|
|
SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
|
|
SET(CMAKE_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ ${CMAKE_LIBRARY_PATH})
|
|
|
|
@@ -497,10 +492,11 @@ IF (BLAS_FOUND AND BLAS_INSTALL_LIBRARIES)
|
|
ENDIF()
|
|
|
|
# Create THConfig.cmake
|
|
+if(0)
|
|
-GET_TARGET_PROPERTY(TH_OUTPUT_NAME TH LOCATION)
|
|
GET_FILENAME_COMPONENT(TH_OUTPUT_NAME ${TH_OUTPUT_NAME} NAME)
|
|
SET(TH_LIBRARIES "${CMAKE_INSTALL_PREFIX}/${TH_INSTALL_LIB_SUBDIR}/${TH_OUTPUT_NAME}")
|
|
SET(TH_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${TH_INSTALL_INCLUDE_SUBDIR}/TH")
|
|
CONFIGURE_FILE(THConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/cmake-exports/THConfig.cmake")
|
|
INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake-exports/THConfig.cmake"
|
|
DESTINATION "${TH_INSTALL_CMAKE_SUBDIR}")
|
|
+endif()
|
|
\ No newline at end of file
|