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

Merge topic 'minor-cleanups'

Browse Source 
f6c21894 Modules: Rename internal platform-specific compiler determination modules
0c7951a9 cmLocalGenerator: Consolidate conditions in AddArchitectureFlags
This commit is contained in:
Brad King 2016-06-03 10:45:59 -04:00 committed by CMake Topic Stage
commit 0663dbf133
8 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Modules/CMakeDetermineCCompiler.cmake
View File

@ -34,6 +34,7 @@
include(${CMAKE_ROOT}/Modules/CMakeDetermineCompiler.cmake) include(${CMAKE_ROOT}/Modules/CMakeDetermineCompiler.cmake)
# Load system-specific compiler preferences for this language. # Load system-specific compiler preferences for this language.
include(Platform/${CMAKE_SYSTEM_NAME}-Determine-C OPTIONAL)
include(Platform/${CMAKE_SYSTEM_NAME}-C OPTIONAL) include(Platform/${CMAKE_SYSTEM_NAME}-C OPTIONAL)
if(NOT CMAKE_C_COMPILER_NAMES) if(NOT CMAKE_C_COMPILER_NAMES)
set(CMAKE_C_COMPILER_NAMES cc) set(CMAKE_C_COMPILER_NAMES cc)

1
Modules/CMakeDetermineCXXCompiler.cmake
View File

@ -33,6 +33,7 @@
include(${CMAKE_ROOT}/Modules/CMakeDetermineCompiler.cmake) include(${CMAKE_ROOT}/Modules/CMakeDetermineCompiler.cmake)
# Load system-specific compiler preferences for this language. # Load system-specific compiler preferences for this language.
include(Platform/${CMAKE_SYSTEM_NAME}-Determine-CXX OPTIONAL)
include(Platform/${CMAKE_SYSTEM_NAME}-CXX OPTIONAL) include(Platform/${CMAKE_SYSTEM_NAME}-CXX OPTIONAL)
if(NOT CMAKE_CXX_COMPILER_NAMES) if(NOT CMAKE_CXX_COMPILER_NAMES)
set(CMAKE_CXX_COMPILER_NAMES CC) set(CMAKE_CXX_COMPILER_NAMES CC)

1
Modules/CMakeDetermineFortranCompiler.cmake
View File

@ -20,6 +20,7 @@
# as a default compiler # as a default compiler
include(${CMAKE_ROOT}/Modules/CMakeDetermineCompiler.cmake) include(${CMAKE_ROOT}/Modules/CMakeDetermineCompiler.cmake)
include(Platform/${CMAKE_SYSTEM_NAME}-Determine-Fortran OPTIONAL)
include(Platform/${CMAKE_SYSTEM_NAME}-Fortran OPTIONAL) include(Platform/${CMAKE_SYSTEM_NAME}-Fortran OPTIONAL)
if(NOT CMAKE_Fortran_COMPILER_NAMES) if(NOT CMAKE_Fortran_COMPILER_NAMES)
set(CMAKE_Fortran_COMPILER_NAMES f95) set(CMAKE_Fortran_COMPILER_NAMES f95)

0
Modules/Platform/CYGWIN-CXX.cmake → Modules/Platform/CYGWIN-Determine-CXX.cmake
View File

0
Modules/Platform/Darwin-CXX.cmake → Modules/Platform/Darwin-Determine-CXX.cmake
View File

0
Modules/Platform/Linux-CXX.cmake → Modules/Platform/Linux-Determine-CXX.cmake
View File

0
Modules/Platform/Windows-CXX.cmake → Modules/Platform/Windows-Determine-CXX.cmake
View File

6
Source/cmLocalGenerator.cxx
View File

@ -1475,11 +1475,7 @@ void cmLocalGenerator::AddArchitectureFlags(std::string& flags,
const std::string& config) const std::string& config)
{ {
// Only add Mac OS X specific flags on Darwin platforms (OSX and iphone): // Only add Mac OS X specific flags on Darwin platforms (OSX and iphone):
if (!this->Makefile->IsOn("APPLE")) { if (this->Makefile->IsOn("APPLE") && this->EmitUniversalBinaryFlags) {
return;
}
if (this->EmitUniversalBinaryFlags) {
std::vector<std::string> archs; std::vector<std::string> archs;
target->GetAppleArchs(config, archs); target->GetAppleArchs(config, archs);
const char* sysroot = this->Makefile->GetDefinition("CMAKE_OSX_SYSROOT"); const char* sysroot = this->Makefile->GetDefinition("CMAKE_OSX_SYSROOT");