Import 2017-06-07 23:51:09: master d1899940

Author Committer Branch Timestamp Parent
jcfr jcfr master 2015-03-03 17:34:48 master 7263a801
Changeset

COMP: Fix windows packaging error introduced by r24006

This commit updates the OpenSSL install rules to consider the library
keyword "debug" or "optimized" introduced in r24006 by the use of
select_library_configurations macro.

Error fixed by this commit is the following:

5>CPack: - Install project: Slicer
5>CMake Error at C:/D/N/Slicer-1-build/Slicer-build/CMake/LastConfigureStep/cmake_install.cmake:255 (file):
5> file INSTALL cannot find
5> "C:/D/N/Slicer-1-build/OpenSSL-install/Release/bin/optimized.dll".
5>Call Stack (most recent call first):
5> C:/D/N/Slicer-1-build/Slicer-build/cmake_install.cmake:47 (include)
5>CMake Error at C:/D/N/Slicer-1-build/Slicer-build/CMake/LastConfigureStep/cmake_install.cmake:263 (file):
5> file INSTALL cannot find
5> "C:/D/N/Slicer-1-build/OpenSSL-install/Release/bin/debug.dll".
5>Call Stack (most recent call first):
5> C:/D/N/Slicer-1-build/Slicer-build/cmake_install.cmake:47 (include)
5>CMake Error at C:/D/N/Slicer-1-build/Slicer-build/CMake/LastConfigureStep/cmake_install.cmake:271 (file):
5> file INSTALL cannot find
5> "C:/D/N/Slicer-1-build/OpenSSL-install/Release/bin/optimized.dll".
5>Call Stack (most recent call first):
5> C:/D/N/Slicer-1-build/Slicer-build/cmake_install.cmake:47 (include)
5>CMake Error at C:/D/N/Slicer-1-build/Slicer-build/CMake/LastConfigureStep/cmake_install.cmake:279 (file):
5> file INSTALL cannot find
5> "C:/D/N/Slicer-1-build/OpenSSL-install/Release/bin/debug.dll".

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24012 3bd1e089-480b-0410-8dfb-8563597acbee

mod - CMake/SlicerBlockInstallOpenSSL.cmake Diff File