[SDK][CMAKE] The CMake folder is part of our SDK. CORE-9111

svn path=/trunk/; revision=71361
This commit is contained in:
Amine Khaldi 2016-05-20 16:06:48 +00:00
parent 507c4db50d
commit 915ed50c3f
25 changed files with 15 additions and 15 deletions

View file

@ -53,15 +53,15 @@ string(TOLOWER ${ARCH} ARCH)
# Compile options
if(ARCH STREQUAL "i386")
include(cmake/config.cmake)
include(sdk/cmake/config.cmake)
elseif(ARCH STREQUAL "amd64")
include(cmake/config-amd64.cmake)
include(sdk/cmake/config-amd64.cmake)
elseif(ARCH STREQUAL "arm")
include(cmake/config-arm.cmake)
include(sdk/cmake/config-arm.cmake)
endif()
# Compiler flags handling
include(cmake/compilerflags.cmake)
include(sdk/cmake/compilerflags.cmake)
add_definitions(-D__REACTOS__)
@ -76,7 +76,7 @@ if(NOT MSVC_IDE)
endif()
# Bison and Flex support
# include(cmake/bison-flex.cmake)
# include(sdk/cmake/bison-flex.cmake)
if(NOT CMAKE_CROSSCOMPILING)
@ -117,7 +117,7 @@ if(NOT CMAKE_CROSSCOMPILING)
else()
if(NEW_STYLE_BUILD)
include(cmake/host-tools.cmake)
include(sdk/cmake/host-tools.cmake)
endif()
# Print build type
@ -207,24 +207,24 @@ else()
enable_language(RC)
# Localization definitions
include(cmake/localization.cmake)
include(sdk/cmake/localization.cmake)
set(I18N_DEFS "")
# This will set I18N_DEFS for later use
set_i18n_language(${I18N_LANG})
# Compiler specific definitions and macros
if(MSVC)
include(cmake/msvc.cmake)
include(sdk/cmake/msvc.cmake)
else()
include(cmake/gcc.cmake)
include(sdk/cmake/gcc.cmake)
endif()
# Generic macros
include(cmake/CMakeMacros.cmake)
include(sdk/cmake/CMakeMacros.cmake)
# IDL macros for widl/midl
# We're using widl now for both MSVC and GCC builds
include(cmake/widl-support.cmake)
include(sdk/cmake/widl-support.cmake)
include_directories(
sdk/include
@ -255,11 +255,11 @@ else()
add_subdirectory(sdk/include/asm)
if(NO_ROSSYM)
include(cmake/baseaddress_dwarf.cmake)
include(sdk/cmake/baseaddress_dwarf.cmake)
elseif(MSVC)
include(cmake/baseaddress_msvc.cmake)
include(sdk/cmake/baseaddress_msvc.cmake)
else()
include(cmake/baseaddress.cmake)
include(sdk/cmake/baseaddress.cmake)
endif()
# For MSVC builds, this puts all debug symbols file in the same directory.

View file

@ -4,7 +4,7 @@ STRING(REPLACE "/PreLoad.cmake" "" REACTOS_HOME_DIR ${CMAKE_CURRENT_LIST_FILE})
#message("/PreLoad.cmake ... ${REACTOS_HOME_DIR}")
SET(CMAKE_MODULE_PATH "${REACTOS_HOME_DIR}/cmake" CACHE INTERNAL "")
SET(CMAKE_MODULE_PATH "${REACTOS_HOME_DIR}/sdk/cmake" CACHE INTERNAL "")
#message("CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}")