Elliottc/cmake support

config/openssl.mpb

@@ -13,8 +13,10 @@ feature(openssl) {
     $(SSL_ROOT)/lib
   }
 
-  includes += $(SSL_INCDIR)
-  libpaths += $(SSL_LIBDIR)
+  specific(!cmake) {
+    includes += $(SSL_INCDIR)
+    libpaths += $(SSL_LIBDIR)
+  }
 
   specific(prop:windows) {
     lit_libs += libeay32 ssleay32
@@ -36,6 +38,15 @@ feature(openssl) {
   specific(prop:microsoft) {
     libpaths += $(SSL_ROOT)/lib/VC
   }
+
+  specific(cmake) {
+    // Undo the else of the !prop:windows above.
+    lit_libs -= ssl crypto
+    includes -= /usr/kerberos/include
+
+    lit_libs += ${OPENSSL_LIBRARIES}
+    includes += ${OPENSSL_INCLUDE_DIR}
+  }
 }
 
 feature(openssl11) {

config/xerces.mpb

@@ -38,9 +38,6 @@ feature(xerces3) {
     $(XERCESCROOT)/lib
   }
 
-  includes += $(XERCESC_INCDIR)
-  libpaths += $(XERCESC_LIBDIR)
-
   specific(prop:microsoft) {
     xerceslib = xerces-c_3
 
@@ -57,6 +54,14 @@ feature(xerces3) {
     xerceslib = xerces-c
   }
 
+  specific(cmake) {
+    includes += ${XercesC_INCLUDE_DIRS}
+    xerceslib = ${XercesC_LIBRARIES}
+  } else {
+    includes += $(XERCESC_INCDIR)
+    libpaths += $(XERCESC_LIBDIR)
+  }
+
   // We have to use lit_libs here as the library decorator
   // does not necessarily match what MPC uses (particularly for
   // static builds).

docs/USAGE

@@ -24,10 +24,10 @@ Usage: mwc.pl [-global <file>] [-include <directory>] [-recurse]
               [-workers <#>] [-workers_dir <dir> | -workers_port <#>]
               [-language <cplusplus | csharp | java | vb>]
               [-type <automake | bcb2007 | bcb2009 | bds4 | bmake | cc | cdt6 |
-                      cdt7 | em3 | ghs | html | iar | make | nmake | rpmspec |
-                      sle | uvis | vc6 | vc7 | vc71 | vc8 | vc9 | vc10 | vc11 |
-                      vc12 | vc14 | vs2017 | vs2019 | vs2022 | wb26 | wb30 |
-                      wix>]
+                      cdt7 | cmake | em3 | ghs | html | iar | make | nmake |
+                      rpmspec | sle | uvis | vc6 | vc7 | vc8 | vc9 | vc10 |
+                      vc11 | vc12 | vc14 | vc71 | vs2017 | vs2019 | vs2022 |
+                      wb26 | wb30 | wix>]
               [files]
 
        -base           Add <project> as a base project to each generated

docs/html/MakeProjectCreator.html

@@ -283,6 +283,18 @@ <h6 class="NumberedTableTitle">MPC Types</h6>
                   </td>
                 </tr>
 
+                <tr>
+                  <td rowspan="1" colspan="1">
+                    <p class="Tbl-Body">
+                      <em class="TableCode">cmake</em>
+                    </p>
+                  </td>
+
+                  <td rowspan="1" colspan="1">
+                    <p class="Tbl-Body">Support for CMake requires user provided modules for custom commands.</p>
+                  </td>
+                </tr>
+
                 <tr>
                   <td rowspan="1" colspan="1">
                     <p class="Tbl-Body">
@@ -6782,7 +6794,7 @@ <h5 class="Head4">Example MPC File</h5>
                 </blockquote>
 
                 <p class="Body">
-                  The following mpc file (<em class=
+                  The following .mpc file (<em class=
             "Code">RTEC_Perf.mpc</em> ) shows the simple and small number of
                   lines required to generate usable build tool project files.
                 </p>
@@ -6899,7 +6911,9 @@ <h5 class="Head4">Example MPC File</h5>
                   Line five adds <em class=
             "Code">TAO_RTEC_PERF_BUILD_DLL</em> to the <em class=
             "Code">dllflags</em>, which defines a macro that is used by the
-                  <em class="Code">rtec_perf_export.h</em> header file.
+                  <em class="Code">rtec_perf_export.h</em> header file when
+                  building shared libraries on platforms that support symbol
+                  visibility.
                 </p>
 
                 <blockquote>
@@ -8174,7 +8188,7 @@ <h6 class="Head5">
 
                 <blockquote>
 
-                  <p class="Code">document_template.pl v1.3</p>
+                  <p class="Code">document_template.pl v1.4</p>
 
                   <p class="Code">
                     Usage: document_template.pl &lt;template&gt;
@@ -8183,6 +8197,16 @@ <h6 class="Head5">
 
                   <p class="Code">&nbsp;</p>
 
+                  <p class="Code">
+                    template &nbsp;&nbsp;&nbsp;- .mpd file to document.  Certain MPC types don't
+                    use a template,
+                  </p>
+
+                  <p class="Code">
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;in that case this aregument can be the Perl module.
+                  </p>
+
                   <p class="Code">
                     html output - This defaults to the name of the
                     template file with the .mpd
@@ -8558,6 +8582,21 @@ <h6 class="NumberedTableTitle">
                           </td>
                         </tr>
 
+                        <tr>
+                          <td rowspan="1" colspan="1">
+                            <p class="Tbl-Body">
+                              <em class=
+                      "TableCode">command-&gt;type</em>
+                            </p>
+                          </td>
+
+                          <td rowspan="1" colspan="1">
+                            <p class="Tbl-Body">
+                              The original type of file for this command.
+                            </p>
+                          </td>
+                        </tr>
+
                       </table>
                     </p>
 

docs/templates/cmake.txt

@@ -0,0 +1,17 @@
+// Current as of 10/26/2022
+// This defines the role of all the template variables specific to the
+// 'cmake' project type.
+//
+// The value $ is used below to represent the dollar sign.  The dollar
+// sign is interpreted by the parser in document_template.pl.
+//
+// Please try to keep this alphabetically sorted.
+//
+cmake_minimum_required = Sets the minimum required version for CMake.
+env_dllout = The value of 'dllout' with $() values converted to $ENV{}.
+env_exeout = The value of 'exeout' with $() values converted to $ENV{}.
+env_includes = The value of 'includes' with $() values converted to $ENV{}.
+env_libout = The value of 'libout' with $() values converted to $ENV{}.
+env_libpaths = The value of 'libpaths' with $() values converted to $ENV{}.
+packages = A list of packages to be used with the find_package() command.
+pre_find_package = A specific command or set of commands to be issued before any find_package() commands are called.

modules/CMakeProjectCreator.pm

@@ -0,0 +1,117 @@
+package CMakeProjectCreator;
+
+# ************************************************************
+# Description   : A CMake Project Creator
+# Author        : Chad Elliott
+# Create Date   : 10/10/2022
+# ************************************************************
+
+# ************************************************************
+# Pragmas
+# ************************************************************
+
+use strict;
+
+use ProjectCreator;
+
+use vars qw(@ISA);
+@ISA = qw(ProjectCreator);
+
+# ************************************************************
+# Subroutine Section
+# ************************************************************
+
+sub pre_generation {
+  my $self = shift;
+
+  ## For CMake, we are expecting a hybrid of custom types and modules.
+  ## We are turning off all automatic output so that the modules defined
+  ## for CMake can handle these artifacts.
+  foreach my $gentype (keys %{$self->{'generated_exts'}}) {
+    $self->{'generated_exts'}->{$gentype}->{'automatic_out'} = 0;
+  }
+}
+
+sub default_to_library {
+  ## In case there are only generated source files...
+  return 1;
+}
+
+sub need_to_write_project {
+  my $self = shift;
+
+  ## Because we do not automatically add custom output, it is possible that
+  ## the project only has generated source files and expects them to cause
+  ## an automatic library name to be chosen.  If the base
+  ## need_to_write_project() tells us that it's only generated source files
+  ## but the user didn't mark this project as "custom only", then we have to
+  ## override it back to 1 to retain the user provided target name.
+  my $status = $self->SUPER::need_to_write_project();
+  if ($status == 2 && !$self->get_assignment('custom_only')) {
+    $status = 1;
+  }
+
+  return $status;
+}
+
+sub get_use_env {
+  ## Override the option getter so that, for CMake, MPC always functions as
+  ## if the -use_env option was supplied on the command line.
+  return 1;
+}
+
+sub pre_write_output_file {
+  my $self = shift;
+  return $self->combine_custom_types();
+}
+
+sub dollar_special {
+  return 1;
+}
+
+sub project_file_prefix {
+  return "CMakeLists.";
+}
+
+sub escape_spaces {
+  #my $self = shift;
+  return 1;
+}
+
+sub get_dll_exe_template_input_file {
+  return 'cmakeexe';
+}
+
+sub get_dll_template_input_file {
+  return 'cmakedll';
+}
+
+sub fill_value {
+  my($self, $name) = @_;
+
+  if ($name eq 'language') {
+    ## Currently, we only support C++
+    return 'CXX' if ($self->get_language() eq Creator::cplusplus());
+  }
+  elsif ($name =~ /^env_(\w+)/) {
+    my $dotdir = '${CMAKE_CURRENT_SOURCE_DIR}' .
+                 ($1 eq 'libpaths' ? ' ${CMAKE_CURRENT_BINARY_DIR}' : '');
+    my $paths = $self->get_assignment($1);
+    if (defined $paths) {
+      $paths = $self->create_array($paths);
+      foreach my $path (@$paths) {
+        if ($path eq '.') {
+          $path = $dotdir;
+        }
+        else {
+          $path =~ s/\$\(([^\)]+)\)/\${$1}/g;
+        }
+      }
+      return "@$paths";
+    }
+  }
+
+  return undef;
+}
+
+1;