diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 38461acaee..9e1d16dffb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -575,6 +575,13 @@ if(WIN32) add_compile_options(/Zl) # omit default library name in .OBJ endif(WIN32) +#-------------------------------- +# Definition directives +# - all clr specific compile definitions should be included in this file +# - all clr specific feature variable should also be added in this file +#---------------------------------- +include(clrdefinitions.cmake) + #------------------------------------- # Include directory directives #------------------------------------- @@ -584,10 +591,7 @@ include_directories("bin/obj") if(FEATURE_STANDALONE_GC) add_definitions(-DFEATURE_STANDALONE_GC) - - if(CLR_CMAKE_PLATFORM_UNIX) - add_subdirectory(src/gc/unix) - endif(CLR_CMAKE_PLATFORM_UNIX) + add_subdirectory(src/gc) endif(FEATURE_STANDALONE_GC) if(FEATURE_STANDALONE_GC_ONLY) @@ -600,13 +604,6 @@ if (CLR_CMAKE_PLATFORM_UNIX) include_directories("src/pal/src/safecrt") endif (CLR_CMAKE_PLATFORM_UNIX) -#-------------------------------- -# Definition directives -# - all clr specific compile definitions should be included in this file -# - all clr specific feature variable should also be added in this file -#---------------------------------- -include(clrdefinitions.cmake) - # Microsoft.Dotnet.BuildTools.Coreclr version set(BuildToolsVersion "1.0.4-prerelease") set(BuildToolsDir "${CLR_DIR}/packages/Microsoft.DotNet.BuildTools.CoreCLR/${BuildToolsVersion}") |