Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-25 12:14:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
- include stlport directory in set_cpp macro
  - move set_cpp macro where it belongs : it's generic enough to go to CMakeMacros.cmake

svn path=/branches/cmake-bringup/; revision=49148
This commit is contained in:
Jérôme Gardou 2010-10-14 20:16:57 +00:00
parent 887822f92e
commit 2d93fd22ac
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeMacros.cmake
View file

@ -139,3 +139,8 @@ MACRO(add_minicd FILENAME _dir _nameoncd)
add_dependencies(minicd ${_nameoncd}_minicd) add_dependencies(minicd ${_nameoncd}_minicd)
ENDMACRO(add_minicd) ENDMACRO(add_minicd)
macro(set_cpp)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/lib/3rdparty/stlport/stlport)
set(IS_CPP 1)
endmacro()

5
base/shell/explorer/CMakeLists.txt
View file

@ -4,8 +4,9 @@ add_subdirectory(notifyhook)
set_unicode() set_unicode()
#NOTE : explorer doesn't follow standard c++, and so doesn't compile with stlport headers #NOTE : explorer doesn't follow standard c++, and so doesn't compile with stlport headers
#I'm not willing to do it if explorer_new is hanging around #I'm not willing to do it if explorer_new is hanging around.
set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>") #jgardou
#set_cpp()
add_definitions(-DWIN32) add_definitions(-DWIN32)
add_definitions(-D__WINDRES__) add_definitions(-D__WINDRES__)

7
gcc.cmake
View file

@ -17,9 +17,6 @@ set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-bas
# Compiler Core # Compiler Core
add_definitions(-pipe -fms-extensions) add_definitions(-pipe -fms-extensions)
# stlport includes
set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> -I${REACTOS_SOURCE_DIR}/lib/3rdparty/stlport/stlport <FLAGS> -o <OBJECT> -c <SOURCE>")
set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
@ -123,10 +120,6 @@ macro(set_unicode)
set(IS_UNICODE 1) set(IS_UNICODE 1)
endmacro() endmacro()
macro(set_cpp)
set(IS_CPP 1)
endmacro()
# Workaround lack of mingw RC support in cmake # Workaround lack of mingw RC support in cmake
macro(set_rc_compiler) macro(set_rc_compiler)
get_directory_property(defines COMPILE_DEFINITIONS) get_directory_property(defines COMPILE_DEFINITIONS)

2
lib/3rdparty/stlport/CMakeLists.txt vendored
View file

@ -4,7 +4,7 @@
add_definitions(-D_STLP_USE_EXCEPTIONS) add_definitions(-D_STLP_USE_EXCEPTIONS)
include_directories(BEFORE stlport) set_cpp()
list(APPEND SOURCE list(APPEND SOURCE
src/allocators.cpp src/allocators.cpp