[CMAKE]

- 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

CMakeMacros.cmake

@@ -138,4 +138,9 @@ MACRO(add_minicd FILENAME _dir _nameoncd)
     add_custom_target(${_nameoncd}_minicd DEPENDS ${BOOTCD_DIR}/${_dir}/${_nameoncd})
     
     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()

base/shell/explorer/CMakeLists.txt

@@ -4,8 +4,9 @@ add_subdirectory(notifyhook)
 set_unicode()
 
 #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
-set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>")
+#I'm not willing to do it if explorer_new is hanging around.
+#jgardou
+#set_cpp()
 
 add_definitions(-DWIN32)
 add_definitions(-D__WINDRES__)

gcc.cmake

@@ -17,9 +17,6 @@ set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-bas
 # Compiler Core
 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_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)
 endmacro()
 
-macro(set_cpp)
-  set(IS_CPP 1)
- endmacro()
-
 # Workaround lack of mingw RC support in cmake
 macro(set_rc_compiler)
     get_directory_property(defines COMPILE_DEFINITIONS)

lib/3rdparty/stlport/CMakeLists.txt

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