diff options
Diffstat (limited to 'build_files/cmake')
-rw-r--r-- | build_files/cmake/macros.cmake | 23 | ||||
-rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 11 |
2 files changed, 0 insertions, 34 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 7dff91bc2b2..3944a8b3c56 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -1228,29 +1228,6 @@ macro(openmp_delayload endif() endmacro() -macro(WINDOWS_SIGN_TARGET target) - if(WITH_WINDOWS_CODESIGN) - if(!SIGNTOOL_EXE) - error("Codesigning is enabled, but signtool is not found") - else() - if(WINDOWS_CODESIGN_PFX_PASSWORD) - set(CODESIGNPASSWORD /p ${WINDOWS_CODESIGN_PFX_PASSWORD}) - else() - if($ENV{PFXPASSWORD}) - set(CODESIGNPASSWORD /p $ENV{PFXPASSWORD}) - else() - message(FATAL_ERROR "WITH_WINDOWS_CODESIGN is on but WINDOWS_CODESIGN_PFX_PASSWORD not set, and environment variable PFXPASSWORD not found, unable to sign code.") - endif() - endif() - add_custom_command(TARGET ${target} - POST_BUILD - COMMAND ${SIGNTOOL_EXE} sign /f ${WINDOWS_CODESIGN_PFX} ${CODESIGNPASSWORD} $<TARGET_FILE:${target}> - VERBATIM - ) - endif() - endif() -endmacro() - macro(blender_precompile_headers target cpp header) if(MSVC) # get the name for the pch output file diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index c9cdef22ace..2b88c710462 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -579,17 +579,6 @@ endif() # used in many places so include globally, like OpenGL blender_include_dirs_sys("${PTHREADS_INCLUDE_DIRS}") -# Find signtool. -set(ProgramFilesX86_NAME "ProgramFiles(x86)") #env dislikes the ( ) -find_program(SIGNTOOL_EXE signtool - HINTS - "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/10/bin/x86/" - "$ENV{ProgramFiles}/Windows Kits/10/bin/x86/" - "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.1/bin/x86/" - "$ENV{ProgramFiles}/Windows Kits/8.1/bin/x86/" - "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.0/bin/x86/" - "$ENV{ProgramFiles}/Windows Kits/8.0/bin/x86/" -) set(WINTAB_INC ${LIBDIR}/wintab/include) if(WITH_OPENAL) |