diff options
| author | Jan Vorlicek <janvorli@microsoft.com> | 2016-01-05 19:39:23 +0300 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2016-01-06 00:55:10 +0300 |
| commit | 9617073da348b69d06fe1a011656ce5a4281b6db (patch) | |
| tree | 81f618a1d488e827311969972145795eb7f44b02 /src/Native | |
| parent | 78d6626a9950ae41321effab28a5dd74999a22bb (diff) | |
Fix build on OSX with CMake version >= 3.4
The new CMake version 3.4 has split `<FLAGS>` into `<FLAGS>` `<INCLUDES>`, so the
assembler invocation was not passing include paths anymore.
This fix adds the `<INCLUDES>` to the CMAKE_ASM_COMPILE_OBJECT variable
in the root CMakeLists.txt.
Diffstat (limited to 'src/Native')
| -rw-r--r-- | src/Native/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Native/CMakeLists.txt b/src/Native/CMakeLists.txt index b7d400b1c..fe9a98c84 100644 --- a/src/Native/CMakeLists.txt +++ b/src/Native/CMakeLists.txt @@ -52,7 +52,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL Darwin) set(CLR_CMAKE_PLATFORM_UNIX 1) set(CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64 1) set(CLR_CMAKE_PLATFORM_DARWIN 1) - set(CMAKE_ASM_COMPILE_OBJECT "${CMAKE_C_COMPILER} <FLAGS> <DEFINES> -o <OBJECT> -c <SOURCE>") + if(CMAKE_VERSION VERSION_LESS "3.4.0") + set(CMAKE_ASM_COMPILE_OBJECT "${CMAKE_C_COMPILER} <FLAGS> <DEFINES> -o <OBJECT> -c <SOURCE>") + else() + set(CMAKE_ASM_COMPILE_OBJECT "${CMAKE_C_COMPILER} <FLAGS> <DEFINES> <INCLUDES> -o <OBJECT> -c <SOURCE>") + endif(CMAKE_VERSION VERSION_LESS "3.4.0") endif(CMAKE_SYSTEM_NAME STREQUAL Darwin) if (CLR_CMAKE_PLATFORM_UNIX) |