diff options
author | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2015-07-15 16:05:30 +0000 |
---|---|---|
committer | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2015-07-15 16:05:30 +0000 |
commit | 2e0133526e85e53ff67a25511b9789d2e10f17d2 (patch) | |
tree | 773e372c749314de37743dd3fc45b62f133d2f9a /openmp/runtime/cmake/MSVC/CFlags.cmake | |
parent | 8da737a18a7b543e0c5b54e3e609d1a5eda8dddc (diff) | |
download | bcm5719-llvm-2e0133526e85e53ff67a25511b9789d2e10f17d2.tar.gz bcm5719-llvm-2e0133526e85e53ff67a25511b9789d2e10f17d2.zip |
Large Refactor of CMake build system
This commit improves numerous functionalities of the OpenMP CMake build
system to be more conducive with LLVM's build system and build philosophies.
The CMake build system, as it was before this commit, was not up to LLVM's
standards and did not implement the configuration stage like most CMake based
build systems offer (check for compiler flags, libraries, etc.) In order to
improve it dramatically in a short period of time, a large refactoring had
to be done.
The main changes done with this commit are as follows:
* Compiler flag checks - The flags are no longer grabbed from compiler specific
directories. They are checked for availability in config-ix.cmake and added
accordingly inside LibompHandleFlags.cmake.
* Feature checks were added in config-ix.cmake. For example, the standard CMake
module FindThreads is probed for the threading model to use inside the OpenMP
library.
* OS detection - There is no longer a LIBOMP_OS variable, OS-specifc build logic
is wrapped around the WIN32 and APPLE macros with !(WIN32 OR APPLE) meaning
a Unix flavor of some sort.
* Got rid of vestigial functions/macros/variables
* Added new libomp_append() function which is used everywhere to conditionally
or undconditionally append to a list
* All targets have the libomp prefix so as not to interfere with any other
project
* LibompCheckLinkerFlag.cmake module was added which checks for linker flags
specifically for building shared libraries.
* LibompCheckFortranFlag.cmake module was added which checks for fortran flag
availability.
* Removed most of the cruft from the translation between the perl+Makefile based
build system and this one. The remaining components that they share are
perl scripts which I'm in the process of removing.
There is still more left to do. The perl scripts still need to be removed, and
a config.h.in file (or similarly named) needs to be added with #cmakedefine lines
in it. But this is a much better first step than the previous system.
Differential Revision: http://reviews.llvm.org/D10656
llvm-svn: 242298
Diffstat (limited to 'openmp/runtime/cmake/MSVC/CFlags.cmake')
-rw-r--r-- | openmp/runtime/cmake/MSVC/CFlags.cmake | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/openmp/runtime/cmake/MSVC/CFlags.cmake b/openmp/runtime/cmake/MSVC/CFlags.cmake deleted file mode 100644 index e233cac1553..00000000000 --- a/openmp/runtime/cmake/MSVC/CFlags.cmake +++ /dev/null @@ -1,75 +0,0 @@ -# -#//===----------------------------------------------------------------------===// -#// -#// The LLVM Compiler Infrastructure -#// -#// This file is dual licensed under the MIT and the University of Illinois Open -#// Source Licenses. See LICENSE.txt for details. -#// -#//===----------------------------------------------------------------------===// -# - -# This file holds Microsoft Visual Studio dependent flags -# The flag types are: -# 1) C/C++ Compiler flags -# 2) Fortran Compiler flags - -######################################################### -# Visual Studio C/C++ Compiler flags -function(append_compiler_specific_c_and_cxx_flags input_c_flags input_cxx_flags) - set(local_c_flags) - set(local_cxx_flags) - append_c_flags("-TP") # Tells the compiler to process a file as a C++ source file. - append_cxx_flags("-EHsc") # Enable C++ exception handling. - append_c_and_cxx_flags("-W3") # Enables diagnostics for remarks, warnings, and errors. - # Additional warnings are also enabled above level 2 warnings. - append_c_and_cxx_flags("-GS") # Lets you control the threshold at which the stack checking routine is called or not called. - if(${IA32}) - append_c_and_cxx_flags("-arch:ia32") # Tells the compiler which features it may target (ia32) - append_c_and_cxx_flags("-Oy-") # equivalent to -fno-omit-frame-pointer - endif() - # CMake prefers the /MD flags when compiling Windows sources, but libomp needs to use /MT instead - # So we replace these /MD instances with /MT within the CMAKE_*_FLAGS variables and put that out to the CACHE. - # replace_md_with_mt() is in HelperFunctions.cmake - replace_md_with_mt(CMAKE_C_FLAGS) - replace_md_with_mt(CMAKE_C_FLAGS_RELEASE) - replace_md_with_mt(CMAKE_C_FLAGS_RELWITHDEBINFO) - replace_md_with_mt(CMAKE_C_FLAGS_DEBUG) - replace_md_with_mt(CMAKE_CXX_FLAGS) - replace_md_with_mt(CMAKE_CXX_FLAGS_RELEASE) - replace_md_with_mt(CMAKE_CXX_FLAGS_RELWITHDEBINFO) - replace_md_with_mt(CMAKE_CXX_FLAGS_DEBUG) - replace_md_with_mt(CMAKE_ASM_MASM_FLAGS) - replace_md_with_mt(CMAKE_ASM_MASM_FLAGS_RELEASE) - replace_md_with_mt(CMAKE_ASM_MASM_FLAGS_RELWITHDEBINFO) - replace_md_with_mt(CMAKE_ASM_MASM_FLAGS_DEBUG) - set(${input_c_flags} ${${input_c_flags}} "${local_c_flags}" PARENT_SCOPE) - set(${input_cxx_flags} ${${input_cxx_flags}} "${local_cxx_flags}" PARENT_SCOPE) -endfunction() - -######################################################### -# Visual Studio Linker flags -function(append_compiler_specific_linker_flags input_ld_flags input_ld_flags_libs) - set(local_ld_flags) - set(local_ld_flags_libs) - append_linker_flags("-WX:NO") - append_linker_flags("-version:${LIBOMP_VERSION}.0") - append_linker_flags("-NXCompat") - append_linker_flags("-DynamicBase") # This option modifies the header of an executable to indicate - # whether the application should be randomly rebased at load time. - if(${IA32}) - append_linker_flags("-machine:i386") - append_linker_flags("-safeseh") - elseif(${INTEL64}) - append_linker_flags("-machine:amd64") - endif() - if(NOT "${def_file}" STREQUAL "") - append_linker_flags("-def:${def_file}") - endif() - # Have Visual Studio use link.exe directly - #set(CMAKE_C_CREATE_SHARED_LIBRARY "link.exe /out:<TARGET> <LINK_FLAGS> <OBJECTS> <LINK_LIBRARIES>" PARENT_SCOPE) - #set(CMAKE_SHARED_LINKER_FLAGS "$ENV{LDLFAGS}" CACHE STRING "Linker Flags" FORCE) - set(${input_ld_flags} ${${input_ld_flags}} "${local_ld_flags}" PARENT_SCOPE) - set(${input_ld_flags_libs} ${${input_ld_flags_libs}} "${local_ld_flags_libs}" PARENT_SCOPE) -endfunction() - |