diff options
| author | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2015-08-28 18:42:10 +0000 |
|---|---|---|
| committer | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2015-08-28 18:42:10 +0000 |
| commit | 45318d1e6f382e240cf47e36d4afe2f02b89dbdb (patch) | |
| tree | 7465293162c2680903ad3b6f6771baf7317aacf8 /runtime/src/kmp_os.h | |
| parent | ac4964ceea28f4634977029e27c9cc3d32a097e2 (diff) | |
[OpenMP] [CMake] Removing expand-vars.pl in favor of CMake's configure_file()
Currently, the libomp CMake build system uses a Perl script to configure files
(tools/expand-vars.pl). This patch replaces the use of the Perl script by using
CMake's configure_file() function. The major changes include:
1. *.var has every $KMP_* variable changed to @LIBOMP_*@
2. kmp_config.h.cmake is a new file which contains all the feature macros and
#cmakedefine lines
3. Most of the -D lines have been moved from LibompDefinitions.cmake but some
OS specific MACROs (e.g., _GNU_SOURCE) remain.
4. All expand-vars.pl related logic is removed from the CMake files.
One important note about this change is that it breaks the old Perl+Makefile
build system because it can't create kmp_config.h properly.
Differential Review: http://reviews.llvm.org/D12211
git-svn-id: https://llvm.org/svn/llvm-project/openmp/trunk@246314 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'runtime/src/kmp_os.h')
| -rw-r--r-- | runtime/src/kmp_os.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/runtime/src/kmp_os.h b/runtime/src/kmp_os.h index 77950bc..0ad0996 100644 --- a/runtime/src/kmp_os.h +++ b/runtime/src/kmp_os.h @@ -16,6 +16,7 @@ #ifndef KMP_OS_H #define KMP_OS_H +#include "kmp_config.h" #include <stdlib.h> #define KMP_FTN_PLAIN 1 @@ -62,8 +63,6 @@ # error Unknown compiler #endif -#include "kmp_platform.h" - #if (KMP_OS_LINUX || KMP_OS_WINDOWS) && !KMP_OS_CNK && !KMP_ARCH_PPC64 # define KMP_AFFINITY_SUPPORTED 1 # if KMP_OS_WINDOWS && KMP_ARCH_X86_64 |