diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-07-11 16:22:04 -0400 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-07-11 16:22:04 -0400 |
| commit | bea1a5de771832463299146b4f2e4317c37f30bc (patch) | |
| tree | b22c7527b5e9d4b21971f6b3d6d8aeda84e0015a /Modules/CMakeASMCompiler.cmake.in | |
| parent | 9f16292b6a3a5959b2e7ddb11e54029b02701965 (diff) | |
| download | cmake-bea1a5de771832463299146b4f2e4317c37f30bc.tar.gz | |
ENH: CMAKE_<LANG>_LINKER_PREFERENCE is now an integer priority, not a
two-step priority (None or Prefered)
Current order: ASM 0, C 10, Fortran 20, CXX 30, Java 40
This is the same order as automake choses:
http://www.gnu.org/software/automake/manual/html_node/How-the-Linker-is-Chosen.html
This change should be backward compatible:
if there is a project using fortran and CXX, they had to set the
LINKER_LANGUAGE explicitely, otherwise cmake complained (but still generated
the project files). Explicitely setting the linker language still overrides
automatic detection.
If somebody has a custom language for cmake and the PREFERENCE starts with
"P", its changed to 100, which gives it preference over all other languages
(except the other custom languages which have also "Prefered"). "None" is
converted to 0.
Alex
Diffstat (limited to 'Modules/CMakeASMCompiler.cmake.in')
| -rw-r--r-- | Modules/CMakeASMCompiler.cmake.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeASMCompiler.cmake.in b/Modules/CMakeASMCompiler.cmake.in index f839a3e220..230805bf42 100644 --- a/Modules/CMakeASMCompiler.cmake.in +++ b/Modules/CMakeASMCompiler.cmake.in @@ -7,5 +7,5 @@ SET(CMAKE_ASM@ASM_DIALECT@_COMPILER_LOADED 1) SET(CMAKE_ASM@ASM_DIALECT@_COMPILER_ENV_VAR "@_CMAKE_ASM_COMPILER_ENV_VAR@") SET(CMAKE_ASM@ASM_DIALECT@_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC) -SET(CMAKE_ASM@ASM_DIALECT@_LINKER_PREFERENCE None) +SET(CMAKE_ASM@ASM_DIALECT@_LINKER_PREFERENCE 0) |