[Openmp-commits] [PATCH] D12211: [OpenMP] [CMake] Removing expand-vars.pl in favor of CMake's configure_file()

[Jonas Hahnfeld via Openmp-commits]

Hahnfeld added a subscriber: Hahnfeld.
Hahnfeld added a comment.

Working good in general, some remarks inline.

(note: There is still the file `libiomp.rc.var` which I think can be deleted anyway)


================
Comment at: runtime/src/libomp.rc.var:15-16
@@ -14,2 +14,4 @@
 #include "winres.h"
+#cmakedefine01 DEBUG_BUILD
+#cmakedefine01 RELWITHDEBINFO_BUILD
 
----------------
Couldn't this be replaced with `#include "kmp_config.h"` ...

================
Comment at: runtime/src/libomp.rc.var:28
@@ -25,3 +27,3 @@
     FILEFLAGS      0
-    #if $KMP_DIAG || $KMP_DEBUG_INFO
+#if DEBUG_BUILD || RELWITHDEBINFO_BUILD
         | VS_FF_DEBUG
----------------
... and this be `#if KMP_DEBUG`?

================
Comment at: runtime/src/libomp.rc.var:43-53
@@ -40,15 +42,13 @@
                 // FileDescription and LegalCopyright should be short.
-                VALUE "FileDescription",  "LLVM* OpenMP* Runtime Library${{ our $MESSAGE_CATALOG; $MESSAGE_CATALOG ? " Message Catalog" : "" }}\0"
+                VALUE "FileDescription",  "LLVM OpenMP* Runtime Library\0"
                 // Following values may be relatively long.
-                VALUE "CompanyName",      "Intel Corporation\0"
+                VALUE "CompanyName",      "LLVM\0"
                 // VALUE "LegalTrademarks",  "\0"  // Not used for now.
-                VALUE "ProductName",      "LLVM* OpenMP* Runtime Library\0"
-                VALUE "ProductVersion",   "$KMP_VERSION_MAJOR.$KMP_VERSION_MINOR\0"
-                VALUE "FileVersion",      "$KMP_VERSION_BUILD\0"
-                VALUE "InternalName",     "$KMP_FILE\0"
-                VALUE "OriginalFilename", "$KMP_FILE\0"
+                VALUE "ProductName",      "LLVM OpenMP* Runtime Library\0"
+                VALUE "ProductVersion",   "@LIBOMP_VERSION_MAJOR at .@LIBOMP_VERSION_MINOR@\0"
+                VALUE "FileVersion",      "@LIBOMP_VERSION_BUILD@\0"
+                VALUE "InternalName",     "@LIBOMP_LIB_FILE@\0"
+                VALUE "OriginalFilename", "@LIBOMP_LIB_FILE@\0"
                 VALUE "Comments",
-                    "LLVM* OpenMP* ${{ our ( $MESSAGE_CATALOG, $KMP_TYPE ); $MESSAGE_CATALOG ? "Runtime Library Message Catalog" : "$KMP_TYPE Library" }} "
-                    "version $KMP_VERSION_MAJOR.$KMP_VERSION_MINOR.$KMP_VERSION_BUILD "
-                    "for $KMP_ARCH architecture built on $KMP_BUILD_DATE.\0"
-                #if $KMP_VERSION_BUILD == 0
+                    "LLVM OpenMP* @LIBOMP_LEGAL_TYPE@ Library "
+                    "version @LIBOMP_VERSION_MAJOR at .@LIBOMP_VERSION_MINOR at .@LIBOMP_VERSION_BUILD@ "
----------------
The README still says `LLVM* OpenMP*`. Was this change intended?


Repository:
  rL LLVM

http://reviews.llvm.org/D12211