diff options
| author | Mike McLaughlin <mikem@microsoft.com> | 2015-02-23 10:09:14 -0800 |
|---|---|---|
| committer | Mike McLaughlin <mikem@microsoft.com> | 2015-02-23 10:09:14 -0800 |
| commit | bfb8bffa32b422b538a3359af84305d47a912d6c (patch) | |
| tree | b0728d94a9ffd995ac00ed2670e370671bae23f1 /src/CMakeLists.txt | |
| parent | 639ac0872d1491d6f7b88bddbd84b3fb36bdc62a (diff) | |
| parent | 63976a08fbe6ece34a2936ebccdf735ea32044a2 (diff) | |
| download | coreclr-bfb8bffa32b422b538a3359af84305d47a912d6c.tar.gz coreclr-bfb8bffa32b422b538a3359af84305d47a912d6c.tar.bz2 coreclr-bfb8bffa32b422b538a3359af84305d47a912d6c.zip | |
Merge remote-tracking branch 'upstream/master' into soscommand1
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 95a56e1baa..95a9640e32 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -10,19 +10,16 @@ include_directories("classlibnative/bcltype") include_directories("classlibnative/cryptography") include_directories("classlibnative/inc") -if(WIN32) -enable_language(ASM_MASM) -else() -enable_language(ASM) -# This prevents inclusion of standard C compiler headers -add_compile_options(-nostdinc) +if(CLR_CMAKE_PLATFORM_UNIX) + # This prevents inclusion of standard C compiler headers + add_compile_options(-nostdinc) -if(NOT CLR_CMAKE_PLATFORM_DARWIN) - # This prevents inclusion of standard C++ compiler headers - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdinc++") -endif(NOT CLR_CMAKE_PLATFORM_DARWIN) + if(NOT CLR_CMAKE_PLATFORM_DARWIN) + # This prevents inclusion of standard C++ compiler headers + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdinc++") + endif(NOT CLR_CMAKE_PLATFORM_DARWIN) -endif(WIN32) +endif(CLR_CMAKE_PLATFORM_UNIX) add_subdirectory(utilcode) add_subdirectory(gcinfo) |