[ros-diffs] [jgardou] 49148: [CMAKE] - include stlport directory in set_cpp macro - move set_cpp macro where it belongs : it's generic enough to go to CMakeMacros.cmake

[jgardou at svn.reactos.org]

Author: jgardou
Date: Thu Oct 14 20:16:57 2010
New Revision: 49148

URL: http://svn.reactos.org/svn/reactos?rev=49148&view=rev
Log:
[CMAKE]
  - include stlport directory in set_cpp macro
  - move set_cpp macro where it belongs : it's generic enough to go to CMakeMacros.cmake

Modified:
    branches/cmake-bringup/CMakeMacros.cmake
    branches/cmake-bringup/base/shell/explorer/CMakeLists.txt
    branches/cmake-bringup/gcc.cmake
    branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt

Modified: branches/cmake-bringup/CMakeMacros.cmake
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake?rev=49148&r1=49147&r2=49148&view=diff
==============================================================================
--- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Thu Oct 14 20:16:57 2010
@@ -138,4 +138,9 @@
     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()

Modified: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explorer/CMakeLists.txt?rev=49148&r1=49147&r2=49148&view=diff
==============================================================================
--- branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] Thu Oct 14 20:16:57 2010
@@ -4,8 +4,9 @@
 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__)

Modified: branches/cmake-bringup/gcc.cmake
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=49148&r1=49147&r2=49148&view=diff
==============================================================================
--- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Thu Oct 14 20:16:57 2010
@@ -16,9 +16,6 @@
 
 # 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>")
 
@@ -123,10 +120,6 @@
    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)

Modified: branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt?rev=49148&r1=49147&r2=49148&view=diff
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] Thu Oct 14 20:16:57 2010
@@ -4,7 +4,7 @@
 
 add_definitions(-D_STLP_USE_EXCEPTIONS)
 
-include_directories(BEFORE stlport)
+set_cpp()
 
 list(APPEND SOURCE
   src/allocators.cpp