summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalVisualStudio7Generator.cxx
Commit message (Collapse)AuthorAgeFilesLines
* Fix Intel Fortran .vfproj files for VS 10Brad King2011-12-131-0/+10
| | | | | | | | | Commit 1be4b6f4 (Order VS local generator Version ivar values consistently, 2011-11-10) fixed the Version ivar of the VS 10 local generator by setting it correctly to 10 instead of leaving it at 7. This broke generation of .vfproj files for the Intel Fortran plugin to VS 10 by mixing VS 9 and 10 formats together in one file. Teach the local generator to pretend the Version is 9 for Intel Fortran targets.
* Order VS local generator Version ivar values consistentlyBrad King2011-11-141-9/+9
| | | | | | | | | | | Move the Version member to the top cmLocalVisualStudioGenerator class and set it consistently for instances created by all the global generator versions. Use an enumeration type with values scaled by a factor of 10 so we can handle VS 7.1 without out-of-order numbers. VS 7.1 support for SuppressStartupBanner was broken by commit 25116a3c (Fix CMAKE_VERBOSE_MAKEFILE for VS10 vcxproj files, 2011-10-11) because it assumed comparison of VS version numbers works. Now it does.
* VS: Add VS_SCC_AUXPATH target property (#12549)Robert Dailey2011-11-011-0/+7
| | | | Maps to SccAuxPath tag in VCPROJ files.
* Also, check for 11.x as an intel fortran version.Bill Hoffman2011-09-301-2/+2
| | | | | | | | | As Dave Cole pointed out the previous commit only checked for 10.x and 12.x. 11.0 was accounted for, but 11.1, 11.2 and 11.3 were not. This patch should make it work for those versions as well. I did a web check and there are 11.0, 11.1, 11.2 and 11.3 versions from Intel. I assume if 12.x uses 11.0 as the version in the .vfproj file, then all of the 11.x versions would as well.
* Use version 11.0 for 12.x and 9.10 for 10.x intel versions to fix 12.1 vsIDE.Bill Hoffman2011-09-301-4/+4
| | | | | | | | The intel compiler for 12.0 and 12.1 are known to expect the file version to be 11.0 in the .vfproj file. For 10.x it should be 9.10. Prior to this fix 12.0 and 10.1 were the only values checked. If those did not match the actual version of intel was put in the vfproj file causing an error about future version load attempt in the IDE.
* Fortran: Add support for free- and fixed-form flagsBrad King2011-08-311-0/+25
| | | | | | | Define a "Fortran_FORMAT" target and source file property. Initialize the target property from a "CMAKE_Fortran_FORMAT" variable. Interpret values "FIXED" and "FREE" to indicate the source file format. Append corresponding flags to the compiler command line.
* VS: Map Fortran free- and fixed-format flags to IDE optionsBrad King2011-08-311-0/+2
| | | | | Add Intel Fortran flags "-free" and "-fixed" to the table so they appear in the IDE correctly.
* VS: Map per-source Fortran flags to IDE optionsBrad King2011-08-311-2/+9
| | | | | Fix the VS generator per-source flag parsing to use the Fortran flag map for Fortran sources.
* Merge topic 'AutomocForQt'David Cole2011-08-251-23/+21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 920a046 QtAutomoc: Eliminate compiler warning b00463f QtAutomoc test: Pass QT_QMAKE_EXECUTABLE e78ce44 Fix automoc with VS builds: apply patch from Bill 71165e9 Silence warning in automoc: use long instead of int 1879bcc Fix build: use std::ios::out|ios::trunc instead of std::ios_base::out 678e124 Only enable the automoc test after checking that Qt4 works 71c29d1 Fix bootstrap test with automoc afb3edc Fix warnings add30e9 Fix build: non-void function must return a value 7e6d845 Automoc.cmake is not needed anymore 2963d0b Fix logic which decides when to execute automoc test 77a5c6e Add documentation for AUTOMOC, add initialization via CMAKE_AUTOMOC bf8ef77 Add a test for automoc d045fd4 Nicer progress message for the automoc target 50cd6ce Move automoc processing from add_executable/library to cmGlobalGenerator cbaac2a Remove trailing whitespace c27607b Refactor SetupAutomocTarget() so it can be run after creating the target 24d9b7d Remove trailing whitespace 58b7fe6 Use cout instead of printf() 72caf4d Add the generated automoc.cpp file to the cleaned files ddb517d Color output when running moc 9303295 Initialize verbose based onb the env.var. ace1215 Move code for parsing a cpp-file from the big loop to separate function 735a5bb Fix line lengths 83b730c Add AUTOMOC to the add_library() command 126c6ea Add the cmake module required currently for automoc de91feb Remove the need to check for .h/.cxx during buildtime d65689a Add actual automoc code from automoc d1c0a5f Start implementing skeleton for automoc in cmake a65011b Start work on automoc: add empty cmQtAutomoc class
| * Fix automoc with VS builds: apply patch from BillAlex Neundorf2011-08-181-23/+21
| | | | | | | | | | | | | | | | This patch moves the creation of VS GUIDs from the final pass to AddHelperCommands() and should fix the failing automoc tests with VS. Alex
* | Merge topic 'add-vs9-midl-inc-dirs'David Cole2011-08-161-0/+7
|\ \ | | | | | | | | | | | | ac22e2a VS9: Add include_directories to midl command lines
| * | VS9: Add include_directories to midl command linesDavid Cole2011-08-121-0/+7
| |/ | | | | | | | | | | | | Makes VS 7, 8 and 9 generators consistent with the VS 10 generator. Adds the "AdditionalIncludeDirectories" attribute at the vcproj level so that all idl files inherit the /I command line args.
* | Merge topic 'intel_fortran_vs2010'David Cole2011-08-161-0/+4
|\ \ | |/ |/| | | | | 3c53fbb Fix custom commands in VS2010 Fortran projects using CFG_INTDIR and test.
| * Fix custom commands in VS2010 Fortran projects using CFG_INTDIR and test.Bill Hoffman2011-08-031-0/+4
| | | | | | | | | | | | | | | | | | For custom commands in VS2010 Fortran projects the INTDIR variable is different than in the rest of the solution because Intel fortran still uses the old VS project files even in VS2010. So, we replace $(Configuration) directly in the project files. I have also added a FortranOnly test that tests this feature and is run on any generator that has Fortran abilities.
* | Add support for Visual Studio project-specific globals (#8707)David Cole2011-07-291-4/+22
|/ | | | | | | | | | | Thanks to Pau Garcia i Quiles for the inspiration for the patch. I've tweaked it a bit compared to what's in the bug tracker: this commit does not allow empty global variable names. I also added usage of the new feature to an existing test. Although it has no effect on the resulting Visual Studio projects, you can verify that the VSResource test produces a non-empty globals section in the generated .vcproj(x) files.
* ENH: Fix Intel 12 plugin project generation for VS < 10Brad King2011-05-161-3/+7
| | | | Suggested-by: Dick Munroe <munroe@csworks.com>
* Merge topic 'vs-intel-dll-implib-outdir'Brad King2011-02-221-1/+1
|\ | | | | | | | | 2516c05 VS: Create a Fortran DLL's import library directory
| * VS: Create a Fortran DLL's import library directoryBrad King2011-02-101-1/+1
| | | | | | | | | | | | | | | | The Intel Fortran plugin forgets to create the output directory into which it will write a DLL's import library. Utilize the fix added by commit f4b3bdc6 (Create an exe's implib output dir for VS, 2009-06-15) and generalized by commit 764ac980 (Generalize exe implib dir creation for VS, 2009-06-16). Create a pre-link rule to make the directory.
* | Merge topic 'vs-link-flag-table'Brad King2011-02-221-0/+18
|\ \ | | | | | | | | | | | | 85163fb Add link flag table entries for VS 7,8,9
| * | Add link flag table entries for VS 7,8,9Brad King2011-02-091-0/+18
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Map the following MS linker flags: /CLRUNMANAGEDCODECHECK /CLRUNMANAGEDCODECHECK:NO /DELAY:UNLOAD /DELAYSIGN /DELAYSIGN:NO /DYNAMICBASE /DYNAMICBASE:NO /NOASSEMBLY /NOENTRY /NXCOMPAT /NXCOMPAT:NO /RELEASE
* | VS7/8/9: Add flag map for string pooling option (#10397)Sebastian Herbst2011-02-011-0/+1
| |
* | VS7/8/9: Map whole program optimization flags (#10263)Philip Lowman2011-02-011-0/+4
| |
* | Add FloatingPointModel to the list of known VS7 generator flags.James Bigler2011-01-311-0/+5
|/ | | | Added FloatingPointModel with /fp:precise, /fp:strict, and /fp:fast.
* Merge topic 'fix-11695-spaces-in-vs10-rc-defs'Brad King2011-01-281-3/+6
|\ | | | | | | | | | | | | | | 008d116 VSResource: Avoid windres /D with quoted spaces (#11695) 8f9919d Avoid space in rc /D values for VS6 and Cygwin (#11695) 78fe97f Fix line too long KWStyle issue (#11695) 6627560 VS10: Escape double quote chars in defines for rc files (#11695)
| * Fix line too long KWStyle issue (#11695)David Cole2011-01-261-1/+2
| |
| * VS10: Escape double quote chars in defines for rc files (#11695)David Cole2011-01-261-3/+5
| | | | | | | | | | | | | | | | To get rc defines to work in the VS10 IDE requires \" when constructing PreprocessorDefinitions strings. This is different than defines for cl. Also, per-file rc defines were not being generated. Fix that, too.
* | Honor VS_SCC_* properties in Fortran targets (#10237)Brad King2011-01-171-11/+18
|/ | | | | | Factor out generation of SccProjectName, SccLocalPath, and SccProvider from cmLocalVisualStudio7Generator::WriteProjectStart and call it from cmLocalVisualStudio7Generator::WriteProjectStartFortran too.
* Merge topic 'fix-11461-add-midl-vs10'Brad King2011-01-111-1/+0
|\ | | | | | | | | | | | | e33cbda VSMidl Test: Use correct include_directories with VS6 (#11461) 262da91 Prohibit space in HOME value for VSMidl test. 13caaa3 VS10: Finish Midl support (#11461)
| * VS10: Finish Midl support (#11461)David Cole2011-01-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit addresses all of the following: http://public.kitware.com/Bug/view.php?id=8165 http://public.kitware.com/Bug/view.php?id=10687 http://public.kitware.com/Bug/view.php?id=11311 http://public.kitware.com/Bug/view.php?id=11461 With this commit, the midl support for VS10 is as complete as midl support ever was for VS9 and earlier. The VSMidl test should run on all Visual Studio generator based dashboards. CMake no longer sends C++ compiler /D flag values to the midl compiler in Visual Studio generated projects. I think if we want to add that in the future, we should add a way to pass midl compiler specific flags and perhaps an optional way to add in the C++ definitions, too. For now, not sending them along gets past the immediate problem wherein idl files in a CMake VS generated project just didn't work at all. The VSMidl test added in this commit was inspired by the patch attached to 8165. The test had to be modified such that it will run in a directory whose name contains no spaces. There is an existing bug filed against VS10's midl asking Microsoft to fix that problem. But for now, the test added in this commit works by copying the source directory to a location that avoids spaces in the directory names. Inspired-By: Robert Lenhardt
* | Merge topic 'vs-Fortran-only-DLL'Brad King2011-01-111-1/+6
|\ \ | | | | | | | | | | | | f661b95 VS: Fix linking of Fortran-only DLL projects (#10803)
| * | VS: Fix linking of Fortran-only DLL projects (#10803)Brian Bassett2011-01-061-1/+6
| | | | | | | | | | | | Emit the LinkDLL attribute of VFLinkerTool for Fortran DLLs.
* | | Map multiple /FI flags for VS < 10 (#11649)Brad King2011-01-031-1/+1
| |/ |/| | | | | | | The /FI flag may be repeated so the flag table entry needs to be marked with SemicolonAppendable. This was already the case for VS 10.
* | Simplify VS generator ConstructScript interfaceBrad King2010-12-081-12/+2
| | | | | | | | | | Pass to cmLocalVisualStudioGenerator::ConstructScript a cmCustomCommand instance instead of extracting arguments at all call sites.
* | Improve signature of cmLocalGenerator::GetRealDependencyBrad King2010-12-081-3/+6
| | | | | | | | Allow file-level custom command dependencies to be skipped.
* | Set Intel .vfproj RuntimeLibrary attributeBrad King2010-11-091-0/+1
| | | | | | | | | | | | Look for the "/threads", "/libs:dll", and "/dbglibs" flags and convert them to the proper RuntimeLibrary attribute value in the IDE. This is a 3-to-1 flag mapping and such needs special handling in the parser.
* | Fix Intel .vfproj SubSystem attribute valuesBrad King2010-11-091-2/+4
| | | | | | | | | | | | | | | | The SubSystem attribute value must be "subSystemConsole" or "subSystemWindows", not "1" or "2". Commit 20f49730 (Reset platform/compiler info status for each language, 2010-09-28) exposed this bug by (correctly) passing the /libs:dll flag to the compiler, which chokes the linker if a value for "/subsystem:" is not given.
* | VS: Map /ENTRY linker option to EntryPointSymbolPatrick Gansterer2010-08-261-0/+2
| |
* | VS: Add more TargetMachine option valuesPatrick Gansterer2010-08-241-0/+15
| |
* | For VS10: Really use full path file names.David Cole2010-06-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | I naively assumed in my previous commit that the Convert call would correctly convert a relative path file name correctly relative to the makefile's current output directory. It actually converts it relative to the process's current working directory. So it would be different depending on how you launched cmake-gui. This commit ensures that the generated files are always the same by starting with a full path to begin with, based on the makefile GetCurrentOutputDirectory method.
* | Use full path file names to express dependencies.David Cole2010-06-211-3/+5
|/ | | | | | | | | This is especially important for the Visual Studio 10 generator and its quirky current working directory behavior. Also, emit more information about exactly what files are out of date when cmakeCheckStampFile returns false.
* Add STATIC_LIBRARY_FLAGS_<CONFIG> property (#10768)Brad King2010-05-281-1/+14
| | | | This is a per-configuration version of STATIC_LIBRARY_FLAGS.
* Fix .pdb name attribute in VS project filesBrad King2010-04-281-2/+2
| | | | | | | The PDB file name for VCLinkerTool is specified by the xml attribute "ProgramDatabaseFile", not "ProgramDataBaseFile" (note the lower-case character 'b'). VS seems to cope with the incorrect capitalization but the combination of VS 7.1 and Incredibuild does not. See issue #10614.
* Partial fix from bug #10503, use full paths to fix custom commands.Bill Hoffman2010-04-021-2/+4
| | | | This fixes tests ExternalProject and LinkDirectory for VS 2010.
* Fix issue #9042 - correctly this time. Fix failing tests on VS 7, 8 and 9 ↵David Cole2009-12-241-2/+2
| | | | dashboards. Use ConvertToXMLOutputPathSingle instead of ConvertToOptionallyRelativeOutputPath to handle spaces in the path and double quoting properly. Related to commit trying to fix issue #9042 from yesterday.
* Fix issue #9042 - use relative path for pdb file name when ↵David Cole2009-12-231-2/+6
| | | | CMAKE_USE_RELATIVE_PATHS is on.
* Fix .vfproj files with per-source settingsBrad King2009-12-021-0/+4
| | | | | | | The Intel Fortran plugin to VS defines VFFortranCompilerTool as the compiler tool. This commit fixes generated projects to use that tool for per-source settings instead of VCCLCompilerTool. We were already using it for target-wide compiler settings.
* Do not link library dependencies in VS solutionsBrad King2009-10-201-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | In VS 8 and greater this commit implements add_dependencies(myexe mylib) # depend without linking by adding the LinkLibraryDependencies="false" option to project files. Previously the above code would cause myexe to link to mylib in VS 8 and greater. This option prevents dependencies specified only in the solution from being linked. We already specify the real link library dependencies in the project files, and any project depending on this to link would not have worked in Makefile generators. We were already avoiding this problem in VS 7.1 and below by inserting intermediate mylib_UTILITY targets. It was more important for those versions because if a static library depended on another library the librarian would copy the dependees into the depender! This is no longer the case with VS 8 and above so we do not need that workaround. See issue #9732.
* Avoid C++ linker language in VS Fortran projectBrad King2009-10-191-1/+2
| | | | | | | | | | | | | | | In Visual Studio project files we pass compiler flags to the whole target based on the linker language, which works for MS tools and combinations of C and C++. For the Intel Fortran plugin though the generated .vfproj files should never contain C or C++ options. We generate .vfproj files only for targets consisting only of Fortran code. Now that the linker language is computed transitively through linking it is possible that the linker language is C++ for an otherwise Fortran-only project. This commit forces Fortran as the linker language for the purpose of specifying target-wide flags in .vfproj files. See issue #9719.
* Fix use of module .def files for MS toolsBrad King2009-09-291-21/+7
| | | | | | | We recognize .def source files and map them to the /DEF:<file> option in the MSVC tools. Previously this worked only for shared libraries. This commit cleans up the implementation and makes it work for executables too. See issue #9613.
* Convert CMake to OSI-approved BSD LicenseBrad King2009-09-281-14/+9
| | | | | | | This converts the CMake license to a pure 3-clause OSI-approved BSD License. We drop the previous license clause requiring modified versions to be plainly marked. We also update the CMake copyright to cover the full development time range.
generated by cgit v0.12 at 2025-01-17 16:56:49 (GMT)