kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'InstallRequiredSystemLibraries-vs-openmp' 

d538c55e Help: Add notes for topic 'InstallRequiredSystemLibraries-vs-openmp'
bdb5007b InstallRequiredSystemLibraries: Install OpenMP runtime libs (#15117)
This commit is contained in:
Brad King 2014-09-04 09:48:17 -04:00 committed by CMake Topic Stage
parent 88400e5c5b d538c55ea4
commit 9651cb70ae
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Help/release/dev/InstallRequiredSystemLibraries-vs-openmp.rst Normal file
View File

@ -0,0 +1,6 @@
InstallRequiredSystemLibraries-vs-openmp
----------------------------------------
* The :module:`InstallRequiredSystemLibraries` module gained a new
``CMAKE_INSTALL_OPENMP_LIBRARIES`` option to install MSVC OpenMP
runtime libraries.

36
Modules/InstallRequiredSystemLibraries.cmake
View File

@ -19,6 +19,8 @@
# libraries are installed when both debug and release are available. If
# CMAKE_INSTALL_MFC_LIBRARIES is set then the MFC run time libraries are
# installed as well as the CRT run time libraries. If
# CMAKE_INSTALL_OPENMP_LIBRARIES is set then the OpenMP run time libraries
# are installed as well. If
# CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION is set then the libraries are
# installed to that directory rather than the default. If
# CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS is NOT set, then this
@ -377,6 +379,40 @@ if(MSVC)
endif()
endif()
# MSVC 8 was the first version with OpenMP
# Furthermore, there is no debug version of this
if(CMAKE_INSTALL_OPENMP_LIBRARIES)
macro(OPENMP_FILES_FOR_VERSION version_a version_b)
set(va "${version_a}")
set(vb "${version_b}")
set(MSVC${va}_OPENMP_DIR "${MSVC${va}_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC${vb}.OPENMP")
if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
set(__install__libs ${__install__libs}
"${MSVC${va}_OPENMP_DIR}/vcomp${vb}.dll")
endif()
endmacro()
if(MSVC80)
OPENMP_FILES_FOR_VERSION(80 80)
endif()
if(MSVC90)
OPENMP_FILES_FOR_VERSION(90 90)
endif()
if(MSVC10)
OPENMP_FILES_FOR_VERSION(10 100)
endif()
if(MSVC11)
OPENMP_FILES_FOR_VERSION(11 110)
endif()
if(MSVC12)
OPENMP_FILES_FOR_VERSION(12 120)
endif()
if(MSVC14)
OPENMP_FILES_FOR_VERSION(14 140)
endif()
endif()
foreach(lib
${__install__libs}
)