1. 28 Nov, 2018 12 commits
    • Stephan Szabo's avatar
      VS: Manually fix generated NASM flag table · fc58a40e
      Stephan Szabo authored
      Drop '"[value]"' placeholders.
      fc58a40e
    • Stephan Szabo's avatar
      VS: Add CUDA flag table entry for -maxrregcount · 7fd339b1
      Stephan Szabo authored
      Original header commit v3.12.0-rc2~10^2
      7fd339b1
    • Stephan Szabo's avatar
      VS: Add more CUDA flag table entries · f61e0975
      Stephan Szabo authored
      Original header commit v3.9.0-rc1~431^2~2
      f61e0975
    • Stephan Szabo's avatar
      VS: Select CUDA code generation architectures · c17809bc
      Stephan Szabo authored
      Original header commit v3.9.0-rc1~431^2~4
      
      Parse the `-gencode=`, `-arch`, and `-code` flags and generate a
      `CodeGeneration` field in the project file.
      c17809bc
    • Stephan Szabo's avatar
      VS: Select the CUDA runtime library · 73ce99cb
      Stephan Szabo authored
      Original header commit v3.9.0-rc1~431^2~5
      
      Parse the `-cudart=` option and add a corresponding `CudaRuntime`
      field to the generated project file.  Also add a matching `.lib`
      to the list of libraries linked.
      73ce99cb
    • Stephan Szabo's avatar
      VS: Place CUDA host compiler options in proper project file fields · f044bbbf
      Stephan Szabo authored
      Original header commit v3.9.0-rc1~431^2~6
      
      The CUDA Toolkit's VS integration provides abstractions for host
      compiler options for `nvcc` to pass through `-Xcompiler` to the host
      MSVC.  Populate our secondary flag table and use it to remove flags from
      the `AdditionalCompilerOptions` in favor of their abstractions.
      
      Unfortunately a bug in the CUDA 8.0 VS integration prevents us from
      passing anything in `AdditionalCompilerOptions` reliably.  After taking
      out the flags that have dedicated abstractions, drop the rest.
      f044bbbf
    • Stephan Szabo's avatar
      Add placeholder CUDA json flag tables · 7faa4d59
      Stephan Szabo authored
      Generate json flag tables from initial placeholder headers
      
      Original header commit v3.9.0-rc1~431^2~10
      
      The CUDA Toolkit's VS integration defines abstractions for both options
      to `nvcc` and options to pass through `-Xcompiler` to the host MSVC.
      We need a separate flag table to parse each set of flags into the
      corresponding abstractions.  Add empty placeholders for these tables.
      7faa4d59
    • Stephan Szabo's avatar
      Add json flag tables for C# · 6e947179
      Stephan Szabo authored
      Generate initial json flag tables for C# based on the initial
      headers.
      
      Original header commit v3.8.0-rc1~230^2
      
      Add these (currently unused) tables in preparation for `.csproj`
      generation support.  Populate the tables for every version with a set of
      initial values that work well for me with VS 12 and VS 14.  Later we may
      need to generate them more thoroughly from MSBuild `.xml` files.
      6e947179
    • Stephan Szabo's avatar
      Add initial NASM flag table json · 2f37ce5e
      Stephan Szabo authored
      Generated from the nasm.xml provided by CMake.
      
      python cmConvertMSBuildXMLToJSON.py -t v10 ...\Templates\MSBuild\nasm.xml
      2f37ce5e
    • Stephan Szabo's avatar
      Add CL, LIB, Link, MASM, RC flag json · a8446116
      Stephan Szabo authored
      Adding flag json files generated from MSVC xml files.
      
      python cmConvertMSBuildXMLToJSON.py -t v10 "...\MSBuild\Microsoft.Cpp\v4.0\1033\cl.xml"
      python cmConvertMSBuildXMLToJSON.py -t v11 "c:\...\MSBuild\Microsoft.Cpp\v4.0\V110\1033\cl.xml"
      python cmConvertMSBuildXMLToJSON.py -t v12 "c:\...\MSBuild\Microsoft.Cpp\v4.0\V120\1033\cl.xml"
      python cmConvertMSBuildXMLToJSON.py -t v140 "c:\...\MSBuild\Microsoft.Cpp\v4.0\V140\1033\cl.xml"
      python cmConvertMSBuildXMLToJSON.py -t v141 "C:\...\Common7\IDE\VC\VCTargets"\1033\cl.xml"
      
      python cmConvertMSBuildXMLToJSON.py -t v10 "c:\...\MSBuild\Microsoft.Cpp\v4.0\1033\rc.xml
      python cmConvertMSBuildXMLToJSON.py -t v11 "c:\...\MSBuild\Microsoft.Cpp\v4.0\v110\1033\rc.xml
      python cmConvertMSBuildXMLToJSON.py -t v12 "c:\...\MSBuild\Microsoft.Cpp\v4.0\v120\1033\rc.xml
      python cmConvertMSBuildXMLToJSON.py -t v14 "c:\...\MSBuild\Microsoft.Cpp\v4.0\v140\1033\rc.xml
      
      python cmConvertMSBuildXMLToJSON.py -t v10 "c:\...\MSBuild\Microsoft.Cpp\v4.0\1033\lib.xml
      python cmConvertMSBuildXMLToJSON.py -t v11 "c:\...\MSBuild\Microsoft.Cpp\v4.0\v110\1033\lib.xml
      python cmConvertMSBuildXMLToJSON.py -t v12 "c:\...\MSBuild\Microsoft.Cpp\v4.0\v120\1033\lib.xml
      python cmConvertMSBuildXMLToJSON.py -t v14 "c:\...\MSBuild\Microsoft.Cpp\v4.0\v140\1033\lib.xml
      
      python cmConvertMSBuildXMLToJSON.py -t v10 "c:\...\MSBuild\Microsoft.Cpp\v4.0\1033\link.xml"
      python cmConvertMSBuildXMLToJSON.py -t v11 "c:\...\MSBuild\Microsoft.Cpp\v4.0\V110\1033\link.xml"
      python cmConvertMSBuildXMLToJSON.py -t v12 "c:\...\MSBuild\Microsoft.Cpp\v4.0\V120\1033\link.xml"
      python cmConvertMSBuildXMLToJSON.py -t v140 "c:\...\MSBuild\Microsoft.Cpp\v4.0\V140\1033\link.xml"
      python cmConvertMSBuildXMLToJSON.py -t v141 "C:\...\Common7\IDE\VC\VCTargets"\1033\link.xml"
      
      python cmConvertMSBuildXMLToJSON.py -t v10 "c:\...\MSBuild\Microsoft.Cpp\v4.0\BuildCustomizations\masm.xml"
      python cmConvertMSBuildXMLToJSON.py -t v11 "c:\...\MSBuild\Microsoft.Cpp\v4.0\V110\BuildCustomizations\masm.xml"
      python cmConvertMSBuildXMLToJSON.py -t v12 "c:\...\MSBuild\Microsoft.Cpp\v4.0\V120\BuildCustomizations\masm.xml"
      python cmConvertMSBuildXMLToJSON.py -t v14 "c:\...\MSBuild\Microsoft.Cpp\v4.0\V140\BuildCustomizations\masm.xml"
      a8446116
    • Stephan Szabo's avatar
      Convert cmIDEFlagTable to use owned strings · 82793021
      Stephan Szabo authored
      Convert from char* to std::string in flag tables.
      Change termination condition from nullptr to empty string in command flag.
      Update tables to store empty strings.
      82793021
    • Stephan Szabo's avatar
      Update XML->JSON generation script · 139b3998
      Stephan Szabo authored
      Update generation script to write a newline to generated json.
      Update generation script to remove / or - at start of switches in xml
      Update generation script to put separators on switch as in headers
      139b3998
  2. 15 Nov, 2018 8 commits
  3. 14 Nov, 2018 18 commits
  4. 13 Nov, 2018 2 commits
    • Frank Benkstein's avatar
      configure_file: canonicalize input and output path in dependencies · 6199637e
      Frank Benkstein authored
      Represent the input file path internally in canonical form.  Otherwise
      multiple `configure_file` calls that share the same input file but specify
      it relative to different directories (e.g. via `../`) result in multiple
      copies of the dependency on the rule to re-run CMake.  This causes the
      Ninja generator to emit duplicate phony build statements for these
      dependencies, which generates an error with `-w dupbuild=err`, which
      will be default in Ninja 1.9.
      
      Also canonicalize the output path for consistency.
      
      Add a test case.
      
      Fixes: #18584
      6199637e
    • Brad King's avatar
      Merge topic 'deprecate-modules2' · 64bc4bda
      Brad King authored
      df780bcc Help: Move deprecated modules to appropriate section.
      Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
      Merge-request: !2603
      64bc4bda