Mercurial > x265

changeset 11924:ae6af09fa63f draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix Build fails for MacOS Duplicate uninstall targets were removed.
author Mythreyi P
date Mon, 20 Nov 2017 09:51:55 +0530
parents 9c0ea9983fab
children 1f5586d03d85
files source/CMakeLists.txt
diffstat 1 files changed, 9 insertions(+-), 21 deletions(-) [+]
line wrap: on
line diff
--- a/source/CMakeLists.txt	Fri Nov 17 12:26:48 2017 +0530
+++ b/source/CMakeLists.txt	Mon Nov 20 09:51:55 2017 +0530
@@ -188,10 +188,10 @@ if(MSVC AND (MSVC_VERSION LESS 1800) AND
     message(FATAL_ERROR "MSVC version 12.0 or above required to support hdr10plus")
 endif()
 if(WIN32 AND (MSVC_VERSION GREATER 1800))
-	if(CMAKE_VERSION VERSION_LESS 3.7)
-		message(FATAL_ERROR "cmake version not compatible for VS 2017. Update the cmake to versions 3.7 or above")
-	endif()
-endif()	
+    if(CMAKE_VERSION VERSION_LESS 3.7)
+        message(FATAL_ERROR "cmake version not compatible for VS 2017. Update the cmake to versions 3.7 or above")
+    endif()
+endif()
 if(GCC)
     add_definitions(-Wall -Wextra -Wshadow)
     add_definitions(-D__STDC_LIMIT_MACROS=1)
@@ -650,13 +650,11 @@ if(X265_LATEST_TAG)
             DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
 endif()
 
-if(NOT WIN32)
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
-                   "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake"
-                   IMMEDIATE @ONLY)
-    add_custom_target(uninstall
-                      "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake")
-endif()
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
+               "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake"
+               IMMEDIATE @ONLY)
+add_custom_target(uninstall
+                  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake")
 
 # Main CLI application
 set(ENABLE_CLI ON CACHE BOOL "Build standalone CLI application")
@@ -725,13 +723,3 @@ if(hasParent)
         set(PLATFORM_LIBS ${PLATFORM_LIBS} PARENT_SCOPE)
     endif(PLATFORM_LIBS)
 endif(hasParent)
-
-# uninstall target
-if(NOT TARGET UNINSTALL)
-    configure_file(
-        "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
-        "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-        IMMEDIATE @ONLY)
-    add_custom_target(UNINSTALL
-        COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
-endif()