[llvm] r238741 - remove the use of the LOCATION CMake variable from r238740.

Greg Bedwell greg_bedwell at sn.scee.net
Mon Jun 1 06:06:11 PDT 2015


Author: gbedwell
Date: Mon Jun  1 08:06:10 2015
New Revision: 238741

URL: http://llvm.org/viewvc/llvm-project?rev=238741&view=rev
Log:
remove the use of the LOCATION CMake variable from r238740.

It caused the following failure:
"Policy CMP0026 is not set: Disallow use of the LOCATION target property."

Modified:
    llvm/trunk/cmake/modules/AddLLVM.cmake

Modified: llvm/trunk/cmake/modules/AddLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=238741&r1=238740&r2=238741&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Mon Jun  1 08:06:10 2015
@@ -284,9 +284,6 @@ function(set_windows_version_resource_pr
     set(ARG_PRODUCT_NAME "LLVM")
   endif()
 
-  get_target_property(target_location ${name} LOCATION)
-  get_filename_component(target_filename ${target_location} NAME)
-
   set_property(SOURCE ${resource_file}
                PROPERTY COMPILE_DEFINITIONS
                "RC_VERSION_FIELD_1=${ARG_VERSION_MAJOR}"
@@ -295,7 +292,6 @@ function(set_windows_version_resource_pr
                "RC_VERSION_FIELD_4=0"
                "RC_FILE_VERSION=\"${ARG_VERSION_STRING}\""
                "RC_INTERNAL_NAME=\"${name}\""
-               "RC_ORIGINAL_FILENAME=\"${target_filename}\""
                "RC_PRODUCT_NAME=\"${ARG_PRODUCT_NAME}\""
                "RC_PRODUCT_VERSION=\"${ARG_VERSION_STRING}\"")
 endfunction(set_windows_version_resource_properties)





More information about the llvm-commits mailing list