libt2n-git Archives

Subject: C++ inter-process communication library branch, cmake-conversion, updated. v0.6-16-g359ca08

From: libt2n-git@xxxxxxxxxxxxxxxxxxxxxxx
To: libt2n-git@xxxxxxxxxxxxxxxxxxxxxxx
Date: Tue, 30 Aug 2011 13:41:48 +0200 (CEST)
The branch, cmake-conversion has been updated
       via  359ca085a54edbe4a2d0b1450160ff83256e2116 (commit)
       via  3721c85af3d64811e5257bf58e2866a84d348fe4 (commit)
      from  34721cc426d4664e002391ac8e7bd96215cd278f (commit)


- Log -----------------------------------------------------------------
commit 359ca085a54edbe4a2d0b1450160ff83256e2116
Author: Kristóf Katus <kristof.katus@xxxxxxxxxxxxx>
Date:   Tue Aug 30 13:40:55 2011 +0200

    Cleaned the indentation of Libt2n.cmake

commit 3721c85af3d64811e5257bf58e2866a84d348fe4
Author: Kristóf Katus <kristof.katus@xxxxxxxxxxxxx>
Date:   Tue Aug 30 13:39:07 2011 +0200

    Install header files to include/${PROJECT_NAME} according to the package 
file exports.

-----------------------------------------------------------------------

Summary of changes:
 codegen/Libt2n.cmake |   66 +++++++++++++++++++++++++-------------------------
 1 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/codegen/Libt2n.cmake b/codegen/Libt2n.cmake
index f547fe9..fd07cd3 100644
--- a/codegen/Libt2n.cmake
+++ b/codegen/Libt2n.cmake
@@ -1,4 +1,4 @@
-# Version of this file: 1.3
+# Version of this file: 1.3.1
 
 # Detect libt2n
 pkg_check_modules(LIBT2N REQUIRED libt2n)
@@ -37,53 +37,53 @@ function(setup_libt2n)
     # Compute include directories
     # TODO: http://www.cmake.org/Bug/view.php?id=11889 contains a better 
solution
     get_property(gcc_include_dirs
-       DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-       PROPERTY INCLUDE_DIRECTORIES
+        DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        PROPERTY INCLUDE_DIRECTORIES
     )
     set(gccxml_include_dirs "")
     foreach(gcc_include_dir ${gcc_include_dirs})
-       set(gccxml_include_dirs "${gccxml_include_dirs} -I${gcc_include_dir}")
+        set(gccxml_include_dirs "${gccxml_include_dirs} -I${gcc_include_dir}")
     endforeach(gcc_include_dir ${gcc_include_dirs})
 
     foreach(CMDGROUP ${ARGV})
         message(STATUS "Processing libt2n command group ${CMDGROUP}")
 
         # We are going to run each .cpp file through gccxml for the current 
CMDGROUP
-       set(T2N_GCCXML_FILES "")
-       set(T2N_GCCXML_COMMANDS "")
+        set(T2N_GCCXML_FILES "")
+        set(T2N_GCCXML_COMMANDS "")
         foreach(T2NFILE ${${CMDGROUP}_GROUP})
             get_filename_component(FILE_NAME ${T2NFILE} NAME)
-           get_filename_component(FILE_EXT ${T2NFILE} EXT)
-           if(NOT FILE_EXT STREQUAL ".cpp")
-               message(FATAL_ERROR "   Error: ${FILE_NAME} is not a .cpp file 
based on its filename extension!")
-           endif()
+            get_filename_component(FILE_EXT ${T2NFILE} EXT)
+            if(NOT FILE_EXT STREQUAL ".cpp")
+                message(FATAL_ERROR "   Error: ${FILE_NAME} is not a .cpp file 
based on its filename extension!")
+            endif()
             message(STATUS "   Processing file ${FILE_NAME}")
 
-           # We build the commands in advance which execute gccxml on each 
file in the CMDGROUP
-           set(T2N_GCCXML_COMMANDS ${T2N_GCCXML_COMMANDS}
-               COMMAND ${LIBT2N_GCCXML} ${gccxml_include_dirs} ${T2NFILE} 
-fxml=${T2NFILE}.xml
-               )
-           # The filenames of the created intermediate gccxml files for the 
current CMDGROUP
-           set(T2N_GCCXML_FILES ${T2N_GCCXML_FILES} ${T2NFILE}.xml)
+            # We build the commands in advance which execute gccxml on each 
file in the CMDGROUP
+            set(T2N_GCCXML_COMMANDS ${T2N_GCCXML_COMMANDS}
+                COMMAND ${LIBT2N_GCCXML} ${gccxml_include_dirs} ${T2NFILE} 
-fxml=${T2NFILE}.xml
+                )
+            # The filenames of the created intermediate gccxml files for the 
current CMDGROUP
+            set(T2N_GCCXML_FILES ${T2N_GCCXML_FILES} ${T2NFILE}.xml)
         endforeach(T2NFILE ${${CMDGROUP}_GROUP})
 
-       add_custom_command(
-           OUTPUT ${CMDGROUP}_common.cpp ${CMDGROUP}_common.hxx 
${CMDGROUP}_client.cpp ${CMDGROUP}_client.hxx ${CMDGROUP}_server.cpp  
${CMDGROUP}_server.hxx
+        add_custom_command(
+            OUTPUT ${CMDGROUP}_common.cpp ${CMDGROUP}_common.hxx 
${CMDGROUP}_client.cpp ${CMDGROUP}_client.hxx ${CMDGROUP}_server.cpp  
${CMDGROUP}_server.hxx
 
-           # Create dummy _common.hxx file
-           COMMAND echo "\\#include \\\"codegen-stubhead.hxx\\\"" 
>${CMDGROUP}_common.hxx
-           COMMAND echo "\\#include \\\"${CMDGROUP}.hxx\\\"" 
>>${CMDGROUP}_common.hxx
+            # Create dummy _common.hxx file
+            COMMAND echo "\\#include \\\"codegen-stubhead.hxx\\\"" 
>${CMDGROUP}_common.hxx
+            COMMAND echo "\\#include \\\"${CMDGROUP}.hxx\\\"" 
>>${CMDGROUP}_common.hxx
 
-           # Invoke gccxml on each source file in the current CMDGROUP and 
delete the dummy file
-           ${T2N_GCCXML_COMMANDS}
-           COMMAND rm -f ${CMDGROUP}_common.hxx
+            # Invoke gccxml on each source file in the current CMDGROUP and 
delete the dummy file
+            ${T2N_GCCXML_COMMANDS}
+            COMMAND rm -f ${CMDGROUP}_common.hxx
 
-           # Run the code generator on all the generated gccxml files and 
remove those intermediate gccxml files
-           COMMAND ${LIBT2N_CODEGEN} ${CMDGROUP} ${T2N_GCCXML_FILES}
-           COMMAND rm -f ${T2N_GCCXML_FILES}
+            # Run the code generator on all the generated gccxml files and 
remove those intermediate gccxml files
+            COMMAND ${LIBT2N_CODEGEN} ${CMDGROUP} ${T2N_GCCXML_FILES}
+            COMMAND rm -f ${T2N_GCCXML_FILES}
 
-           DEPENDS ${${CMDGROUP}_GROUP}
-           )
+            DEPENDS ${${CMDGROUP}_GROUP}
+            )
 
         # Write out pkgconfig file
         configure_file(${LIBT2N_CLIENT_PCTEMPLATE} 
${CMAKE_CURRENT_BINARY_DIR}/${CMDGROUP}.pc @ONLY@)
@@ -93,13 +93,13 @@ function(setup_libt2n)
         # Create shared client library
         add_library(${CMDGROUP} SHARED ${CMDGROUP}_client.cpp 
${CMDGROUP}_client.hxx)
         set_target_properties(${CMDGROUP} PROPERTIES VERSION ${VERSION} 
SOVERSION 1)
-       target_link_libraries(${CMDGROUP} ${Boost_SERIALIZATION_LIBRARIES})
+        target_link_libraries(${CMDGROUP} ${Boost_SERIALIZATION_LIBRARIES})
         install(TARGETS ${CMDGROUP} LIBRARY DESTINATION lib COMPONENT 
sharedlibs)
 
         # Create static client library
         add_library(${CMDGROUP}-static STATIC ${CMDGROUP}_client.cpp 
${CMDGROUP}_client.hxx)
         set_target_properties(${CMDGROUP}-static PROPERTIES OUTPUT_NAME 
"${CMDGROUP}")
-       target_link_libraries(${CMDGROUP}-static 
${Boost_SERIALIZATION_LIBRARIES})
+        target_link_libraries(${CMDGROUP}-static 
${Boost_SERIALIZATION_LIBRARIES})
         install(TARGETS ${CMDGROUP}-static ARCHIVE DESTINATION lib COMPONENT 
staticlibs)
 
         # Prevent clobbering each other during the build
@@ -107,12 +107,12 @@ function(setup_libt2n)
         set_target_properties(${CMDGROUP}-static PROPERTIES 
CLEAN_DIRECT_OUTPUT 1)
 
         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMDGROUP}_client.hxx 
${CMDGROUP}.hxx
-                    DESTINATION include
+                    DESTINATION include/${PROJECT_NAME}
                     COMPONENT headers
         )
 
         # Wait till generated code is available
-       add_custom_target(${CMDGROUP}_codegen_done ALL DEPENDS 
${CMDGROUP}_common.cpp ${CMDGROUP}_common.hxx ${CMDGROUP}_client.cpp 
${CMDGROUP}_client.hxx ${CMDGROUP}_server.cpp  ${CMDGROUP}_server.hxx)
+        add_custom_target(${CMDGROUP}_codegen_done ALL DEPENDS 
${CMDGROUP}_common.cpp ${CMDGROUP}_common.hxx ${CMDGROUP}_client.cpp 
${CMDGROUP}_client.hxx ${CMDGROUP}_server.cpp  ${CMDGROUP}_server.hxx)
         add_dependencies(${CMDGROUP} ${CMDGROUP}_codegen_done)
         add_dependencies(${CMDGROUP}-static ${CMDGROUP}_codegen_done)
 


hooks/post-receive
-- 
C++ inter-process communication library

--
libt2n-git - see http://www.intra2net.com/en/developer/libt2n for details.
To unsubscribe send a mail to libt2n-git+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx   

Current Thread
  • C++ inter-process communication library branch, cmake-conversion, updated. v0.6-16-g359ca08, libt2n-git <=