kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Add compiler target compile options." 

This reverts commit 2d9ec1dadf.
This commit is contained in:
Stephen Kelly 2013-08-09 14:28:43 +02:00
parent 702f630db8
commit b33c9844fa
4 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/CMakeDetermineCompilerABI.cmake
View File

@ -28,9 +28,6 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src)
if(DEFINED CMAKE_${lang}_VERBOSE_FLAG) if(DEFINED CMAKE_${lang}_VERBOSE_FLAG)
set(CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS=${CMAKE_${lang}_VERBOSE_FLAG}") set(CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS=${CMAKE_${lang}_VERBOSE_FLAG}")
endif() 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 try_compile(CMAKE_${lang}_ABI_COMPILED
${CMAKE_BINARY_DIR} ${src} ${CMAKE_BINARY_DIR} ${src}
CMAKE_FLAGS "${CMAKE_FLAGS}" CMAKE_FLAGS "${CMAKE_FLAGS}"

1
Modules/Compiler/Clang.cmake
View File

@ -25,5 +25,4 @@ macro(__compiler_clang lang)
set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIE") set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIE")
set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ") set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
set(CMAKE_${lang}_COMPILE_OPTIONS_VISIBILITY "-fvisibility=") set(CMAKE_${lang}_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
set(CMAKE_${lang}_COMPILE_OPTION_TARGET "-target ")
endmacro() endmacro()

3
Modules/Platform/QNX.cmake
View File

@ -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_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") 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 # Shared libraries with no builtin soname may not be linked safely by
# specifying the file path. # specifying the file path.

14
Source/cmLocalGenerator.cxx
View File

@ -1038,20 +1038,11 @@ cmLocalGenerator::ExpandRuleVariable(std::string const& variable,
// If this is the compiler then look for the extra variable // If this is the compiler then look for the extra variable
// _COMPILER_ARG1 which must be the first argument to the compiler // _COMPILER_ARG1 which must be the first argument to the compiler
const char* compilerArg1 = 0; const char* compilerArg1 = 0;
const char* compilerTarget = 0;
const char* compilerOptionTarget = 0;
if(actualReplace == "CMAKE_${LANG}_COMPILER") if(actualReplace == "CMAKE_${LANG}_COMPILER")
{ {
std::string arg1 = actualReplace + "_ARG1"; std::string arg1 = actualReplace + "_ARG1";
cmSystemTools::ReplaceString(arg1, "${LANG}", lang); cmSystemTools::ReplaceString(arg1, "${LANG}", lang);
compilerArg1 = this->Makefile->GetDefinition(arg1.c_str()); 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) if(actualReplace.find("${LANG}") != actualReplace.npos)
{ {
@ -1072,11 +1063,6 @@ cmLocalGenerator::ExpandRuleVariable(std::string const& variable,
ret += " "; ret += " ";
ret += compilerArg1; ret += compilerArg1;
} }
if (compilerTarget && compilerOptionTarget)
{
ret += compilerOptionTarget;
ret += compilerTarget;
}
return ret; return ret;
} }
return replace; return replace;