[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3818-g205a5da

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  205a5daeaa29f232d9adb6e87a55315483bae653 (commit)
       via  b33c9844fa2c3a6fc7e69688d028bb260582561c (commit)
       via  702f630db8c7e2225b3be9550a4619a47feba1f6 (commit)
      from  a9d330e09a9f17fcac63ed0af3ac14b2fbf2d453 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=205a5daeaa29f232d9adb6e87a55315483bae653
commit 205a5daeaa29f232d9adb6e87a55315483bae653
Merge: a9d330e b33c984
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Aug 9 08:29:31 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 9 08:29:31 2013 -0400

    Merge topic 'revert-COMPILER_TARGET-feature' into next
    
    b33c984 Revert "Add compiler target compile options."
    702f630 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b33c9844fa2c3a6fc7e69688d028bb260582561c
commit b33c9844fa2c3a6fc7e69688d028bb260582561c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Aug 9 14:28:43 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Aug 9 14:28:43 2013 +0200

    Revert "Add compiler target compile options."
    
    This reverts commit 2d9ec1dadfdd10043a98d425abb25d0aef117699.

diff --git a/Modules/CMakeDetermineCompilerABI.cmake b/Modules/CMakeDetermineCompilerABI.cmake
index e9ae995..5d35ce3 100644
--- a/Modules/CMakeDetermineCompilerABI.cmake
+++ b/Modules/CMakeDetermineCompilerABI.cmake
@@ -28,9 +28,6 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src)
     if(DEFINED CMAKE_${lang}_VERBOSE_FLAG)
       set(CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS=${CMAKE_${lang}_VERBOSE_FLAG}")
     endif()
-    if(CMAKE_${lang}_COMPILER_TARGET)
-      set(CMAKE_FLAGS "${CMAKE_FLAGS} -DCMAKE_${lang}_COMPILER_TARGET=${CMAKE_${lang}_COMPILER_TARGET}")
-    endif()
     try_compile(CMAKE_${lang}_ABI_COMPILED
       ${CMAKE_BINARY_DIR} ${src}
       CMAKE_FLAGS "${CMAKE_FLAGS}"
diff --git a/Modules/Compiler/Clang.cmake b/Modules/Compiler/Clang.cmake
index 66b00bd..ec4562a 100644
--- a/Modules/Compiler/Clang.cmake
+++ b/Modules/Compiler/Clang.cmake
@@ -25,5 +25,4 @@ macro(__compiler_clang lang)
   set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIE")
   set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
   set(CMAKE_${lang}_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
-  set(CMAKE_${lang}_COMPILE_OPTION_TARGET "-target ")
 endmacro()
diff --git a/Modules/Platform/QNX.cmake b/Modules/Platform/QNX.cmake
index 315f721..2598411 100644
--- a/Modules/Platform/QNX.cmake
+++ b/Modules/Platform/QNX.cmake
@@ -13,9 +13,6 @@ set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
 set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
 set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
 set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
-# http://www.qnx.com/developers/docs/6.4.0/neutrino/utilities/q/qcc.html#examples
-set(CMAKE_C_COMPILE_OPTION_TARGET "-V")
-set(CMAKE_CXX_COMPILE_OPTION_TARGET "-V")
 
 # Shared libraries with no builtin soname may not be linked safely by
 # specifying the file path.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b515727..9c04109 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1038,20 +1038,11 @@ cmLocalGenerator::ExpandRuleVariable(std::string const& variable,
       // If this is the compiler then look for the extra variable
       // _COMPILER_ARG1 which must be the first argument to the compiler
       const char* compilerArg1 = 0;
-      const char* compilerTarget = 0;
-      const char* compilerOptionTarget = 0;
       if(actualReplace == "CMAKE_${LANG}_COMPILER")
         {
         std::string arg1 = actualReplace + "_ARG1";
         cmSystemTools::ReplaceString(arg1, "${LANG}", lang);
         compilerArg1 = this->Makefile->GetDefinition(arg1.c_str());
-        compilerTarget
-              = this->Makefile->GetDefinition(
-                (std::string("CMAKE_") + lang + "_COMPILER_TARGET").c_str());
-        compilerOptionTarget
-              = this->Makefile->GetDefinition(
-                (std::string("CMAKE_") + lang +
-                                          "_COMPILE_OPTION_TARGET").c_str());
         }
       if(actualReplace.find("${LANG}") != actualReplace.npos)
         {
@@ -1072,11 +1063,6 @@ cmLocalGenerator::ExpandRuleVariable(std::string const& variable,
             ret += " ";
             ret += compilerArg1;
             }
-          if (compilerTarget && compilerOptionTarget)
-            {
-            ret += compilerOptionTarget;
-            ret += compilerTarget;
-            }
           return ret;
           }
         return replace;

-----------------------------------------------------------------------

Summary of changes:
 Modules/CMakeDetermineCompilerABI.cmake |    3 ---
 Modules/Compiler/Clang.cmake            |    1 -
 Modules/Platform/QNX.cmake              |    3 ---
 Source/CMakeVersion.cmake               |    2 +-
 Source/cmLocalGenerator.cxx             |   14 --------------
 5 files changed, 1 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
CMake