[Cmake-commits] CMake branch, next, updated. v3.0.1-5114-gb966d45

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b966d45778fae8adfc2a785b35f68f823a09f364 (commit)
       via  bdb5007b17d3a6db7e2d166e876266ba843a37e9 (commit)
      from  d0638bf28da913b8da7f7899fcf34f714b9065c0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b966d45778fae8adfc2a785b35f68f823a09f364
commit b966d45778fae8adfc2a785b35f68f823a09f364
Merge: d0638bf bdb5007
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 2 11:06:19 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 2 11:06:19 2014 -0400

    Merge topic 'InstallRequiredSystemLibraries-vs-openmp' into next
    
    bdb5007b InstallRequiredSystemLibraries: Install OpenMP runtime libs (#15117)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bdb5007b17d3a6db7e2d166e876266ba843a37e9
commit bdb5007b17d3a6db7e2d166e876266ba843a37e9
Author:     Gregory Sharp <gregsharp at geocities.com>
AuthorDate: Fri Aug 29 16:58:24 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 2 11:07:32 2014 -0400

    InstallRequiredSystemLibraries: Install OpenMP runtime libs (#15117)
    
    Add option CMAKE_INSTALL_OPENMP_LIBRARIES to control the behavior.

diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index 349cbf5..5afb517 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -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}
       )

-----------------------------------------------------------------------

Summary of changes:
 Modules/InstallRequiredSystemLibraries.cmake |   36 ++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)


hooks/post-receive
-- 
CMake