Changeset 302 in flair-src for trunk/lib


Ignore:
Timestamp:
Feb 25, 2019, 4:28:34 PM (3 years ago)
Author:
Sanahuja Guillaume
Message:

modifs nouveau build system

Location:
trunk/lib
Files:
1 deleted
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/CMakeLists.txt

    r297 r302  
    11PROJECT(FlairLibs)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    44
    55add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/FlairCore)
  • trunk/lib/Doxyfile.in

    r22 r302  
    5353# where doxygen was started. If left blank the current directory will be used.
    5454
    55 OUTPUT_DIRECTORY       = $(FLAIR_ROOT)/flair-dev/doc
     55OUTPUT_DIRECTORY       = $(FLAIR_ROOT)/flair-install/doc
    5656
    5757# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
  • trunk/lib/FlairCore/CMakeLists.txt

    r297 r302  
    11PROJECT(FlairCore)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    44
    55find_package(LibXml2 REQUIRED)
    6 
    7 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
    8                 OUTPUT_VARIABLE GCC_VERSION)
    9 
    10 if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
    11         if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
    12                 ADD_DEFINITIONS("-std=c++11")
    13         else()
    14                 ADD_DEFINITIONS("-std=c++0x")
    15         endif()
    16 else()
    17         message(STATUS "GCC version < 4.3, c+11 is not supported!")
    18 endif()
    196
    207FILE(GLOB FLAIRCORE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
     
    2916
    3017add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/nrt)
    31 if(NOT WIN32)
    3218add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/rt)
    33 endif()
    34 
    35 add_custom_target(
    36         ${PROJECT_NAME}_compile_info
    37         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
    38 )
    39 
    40 add_dependencies(FlairCore_rt ${PROJECT_NAME}_compile_info)
    41 add_dependencies(FlairCore_nrt ${PROJECT_NAME}_compile_info)
  • trunk/lib/FlairCore/nrt/CMakeLists.txt

    r2 r302  
    33ADD_DEFINITIONS(-D_GNU_SOURCE -D_REENTRANT)
    44
    5 ADD_LIBRARY(${PROJECT_NAME}
    6         ${FLAIRCORE_SRC}
    7 )
     5FLAIR_LIB(${PROJECT_NAME} "${FLAIRCORE_SRC}")
    86
    9 INSTALL(TARGETS ${PROJECT_NAME}
    10         LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    11         ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    12 )
     7#install here, as FLAIR_LIB function will not find .h (in ../src)
     8FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/../src/*.h")
     9INSTALL(FILES ${files} DESTINATION $ENV{FLAIR_ROOT}/flair-install/include/FlairCore)
  • trunk/lib/FlairCore/rt/CMakeLists.txt

    r2 r302  
    88)
    99
    10 ADD_LIBRARY(${PROJECT_NAME}
    11         ${FLAIRCORE_SRC}
    12 )
     10FLAIR_LIB(${PROJECT_NAME} "${FLAIRCORE_SRC}")
    1311
    14 INSTALL(TARGETS ${PROJECT_NAME}
    15         LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    16         ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    17 )
    18 
    19 FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/../src/*.h")
    20 INSTALL(FILES ${files} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/FlairCore)
  • trunk/lib/FlairCore/src/Widget.h

    r67 r302  
    1515
    1616#include <Object.h>
    17 //#include <io_data.h>
    18 #include <libxml/xpath.h>
    1917
    2018class Widget_impl;
    2119class FrameworkManager_impl;
     20typedef struct _xmlNode xmlNode;
     21typedef xmlNode *xmlNodePtr;
    2222
    2323namespace flair {
  • trunk/lib/FlairFilter/CMakeLists.txt

    r297 r302  
    11PROJECT(FlairFilter)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    4 
    5 find_package(LibXml2 REQUIRED)
    6 
    7 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
    8                 OUTPUT_VARIABLE GCC_VERSION)
    9 
    10 if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
    11         if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
    12                 ADD_DEFINITIONS("-std=c++11")
    13         else()
    14                 ADD_DEFINITIONS("-std=c++0x")
    15         endif()
    16 else()
    17         message(STATUS "GCC version < 4.3, c+11 is not supported!")
    18 endif()
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    194
    205INCLUDE_DIRECTORIES(
    21         ${LIBXML2_INCLUDE_DIR}
    226        ${CMAKE_CURRENT_SOURCE_DIR}/../FlairCore/src
    237        ${CMAKE_CURRENT_SOURCE_DIR}/../FlairSensorActuator/src
     
    3014FILE(GLOB SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
    3115
    32 ADD_LIBRARY(${PROJECT_NAME}
    33         ${SRC_FILES}
     16FLAIR_LIB(${PROJECT_NAME} "${SRC_FILES}"
     17        INCLUDES_DEST_DIR ${PROJECT_NAME}
    3418)
    35 
    36 INSTALL(TARGETS ${PROJECT_NAME}
    37         LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    38         ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    39 )
    40 
    41 #copie des entetes
    42 FILE(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h")
    43 INSTALL(FILES ${HEADER_FILES} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/${PROJECT_NAME})
    44 
    45 add_custom_target(
    46         ${PROJECT_NAME}_compile_info
    47         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
    48 )
    49 
    50 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)
  • trunk/lib/FlairMeta/CMakeLists.txt

    r297 r302  
    11PROJECT(FlairMeta)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    4 
    5 find_package(LibXml2 REQUIRED)
    6 
    7 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
    8                 OUTPUT_VARIABLE GCC_VERSION)
    9 
    10 if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
    11         if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
    12                 ADD_DEFINITIONS("-std=c++11")
    13         else()
    14                 ADD_DEFINITIONS("-std=c++0x")
    15         endif()
    16 else()
    17         message(STATUS "GCC version < 4.3, c+11 is not supported!")
    18 endif()
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    194
    205INCLUDE_DIRECTORIES(
    21         ${LIBXML2_INCLUDE_DIR}
    226        ${CMAKE_CURRENT_SOURCE_DIR}/../FlairCore/src
    237        ${CMAKE_CURRENT_SOURCE_DIR}/../FlairSensorActuator/src
     
    3014FILE(GLOB SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
    3115
    32 ADD_LIBRARY(${PROJECT_NAME}
    33         ${SRC_FILES}
     16FLAIR_LIB(${PROJECT_NAME} "${SRC_FILES}"
     17        INCLUDES_DEST_DIR ${PROJECT_NAME}
    3418)
    35 
    36 INSTALL(TARGETS ${PROJECT_NAME}
    37         LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    38         ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    39 )
    40 
    41 #copie des entetes
    42 FILE(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h")
    43 INSTALL(FILES ${HEADER_FILES} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/${PROJECT_NAME})
    44 
    45 add_custom_target(
    46         ${PROJECT_NAME}_compile_info
    47         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
    48 )
    49 
    50 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)
  • trunk/lib/FlairSensorActuator/CMakeLists.txt

    r297 r302  
    11PROJECT(FlairSensorActuator)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    4 
    5 find_package(LibXml2 REQUIRED)
    6 
    7 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
    8                 OUTPUT_VARIABLE GCC_VERSION)
    9 
    10 if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
    11         if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
    12                 ADD_DEFINITIONS("-std=c++11")
    13         else()
    14                 ADD_DEFINITIONS("-std=c++0x")
    15         endif()
    16 else()
    17         message(STATUS "GCC version < 4.3, c+11 is not supported!")
    18 endif()
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    194
    205INCLUDE_DIRECTORIES(
    21         ${LIBXML2_INCLUDE_DIR}
    226        ${CMAKE_CURRENT_SOURCE_DIR}/src
    237        ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported
     
    2812)
    2913
    30 FILE(GLOB SENSOR_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
     14FILE(GLOB SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
    3115
    32 ADD_LIBRARY(${PROJECT_NAME}
    33         ${SENSOR_SRC}
     16FLAIR_LIB(${PROJECT_NAME} "${SRC_FILES}"
     17        INCLUDES_DEST_DIR ${PROJECT_NAME}
    3418)
    35 
    36 INSTALL(TARGETS ${PROJECT_NAME}
    37         LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    38         ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    39 )
    40 
    41 FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h")
    42 INSTALL(FILES ${files} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/${PROJECT_NAME})
    43 
    44 add_custom_target(
    45         ${PROJECT_NAME}_compile_info
    46         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
    47 )
    48 
    49 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)
  • trunk/lib/FlairSimulator/CMakeLists.txt

    r297 r302  
    11PROJECT(FlairSimulator)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    44
    55find_package(LibXml2 REQUIRED)
    66
    7 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
    8                 OUTPUT_VARIABLE GCC_VERSION)
    9 
    10 if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
    11         if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
    12                 ADD_DEFINITIONS("-std=c++11")
    13         else()
    14                 ADD_DEFINITIONS("-std=c++0x")
    15         endif()
    16 else()
    17         message(STATUS "GCC version < 4.3, c+11 is not supported!")
    18 endif()
    19 
    207INCLUDE_DIRECTORIES(
    21         ${LIBXML2_INCLUDE_DIR}
     8        ${LIBXML2_INCLUDE_DIR}
    229        ${CMAKE_CURRENT_SOURCE_DIR}/src
    2310        ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported
     
    2916)
    3017
    31 FILE(GLOB SIMU_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
    32 
    33 add_custom_target(
    34         ${PROJECT_NAME}_compile_info
    35         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
    36 )
     18FILE(GLOB FLAIRSIMU_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
    3719
    3820add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/no_gl)
    39 add_dependencies(FlairSimulator_nogl ${PROJECT_NAME}_compile_info)
    4021if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
    4122add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/gl)
    42 add_dependencies(FlairSimulator_gl ${PROJECT_NAME}_compile_info)
    4323endif()
  • trunk/lib/FlairSimulator/gl/CMakeLists.txt

    r8 r302  
    33ADD_DEFINITIONS(-D_GNU_SOURCE -D_REENTRANT -DGL)
    44
    5 
    6 ADD_LIBRARY(${PROJECT_NAME}
    7         ${SIMU_SRC}
    8 )
    9 
    10 INSTALL(TARGETS ${PROJECT_NAME}
    11         LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    12         ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    13 )
     5FLAIR_LIB(${PROJECT_NAME} "${FLAIRSIMU_SRC}")
  • trunk/lib/FlairSimulator/no_gl/CMakeLists.txt

    r8 r302  
    33ADD_DEFINITIONS(-D_GNU_SOURCE -D_REENTRANT)
    44
    5 ADD_LIBRARY(${PROJECT_NAME}
    6         ${SIMU_SRC}
    7 )
     5FLAIR_LIB(${PROJECT_NAME} "${FLAIRSIMU_SRC}")
    86
    9 INSTALL(TARGETS ${PROJECT_NAME}
    10         LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    11         ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    12 )
    13 
     7#install here, as FLAIR_LIB function will not find .h (in ../src)
    148FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/../src/*.h")
    15 INSTALL(FILES ${files} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/FlairSimulator)
     9INSTALL(FILES ${files} DESTINATION $ENV{FLAIR_ROOT}/flair-install/include/FlairSimulator)
  • trunk/lib/FlairSimulator/src/Parser.cpp

    r167 r302  
    2727#include <IGeometryCreator.h>
    2828#include <ISceneManager.h>
     29#include <libxml/parser.h>
     30#include <libxml/tree.h>
    2931
    3032using namespace irr;
  • trunk/lib/FlairSimulator/src/Parser.h

    r167 r302  
    2020#include <Gui.h>
    2121#include <Vector3D.h>
    22 #include <libxml/parser.h>
    23 #include <libxml/tree.h>
    2422#include <SColor.h>
     23
     24//todo make a pimpl to remove these forward declaration
     25typedef struct _xmlNode xmlNode;
     26typedef unsigned char xmlChar;
     27typedef struct _xmlDoc xmlDoc;
    2528
    2629namespace flair {
  • trunk/lib/FlairVisionFilter/CMakeLists.txt

    r300 r302  
    11PROJECT(FlairVisionFilter)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    4 
    5 #if(NOT "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv5te")
    6 
    7 find_package(LibXml2 REQUIRED)
    8 
    9 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
    10                 OUTPUT_VARIABLE GCC_VERSION)
    11 
    12 if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
    13         if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
    14                 ADD_DEFINITIONS("-std=c++11")
    15         else()
    16                 ADD_DEFINITIONS("-std=c++0x")
    17         endif()
    18 else()
    19         message(STATUS "GCC version < 4.3, c+11 is not supported!")
    20 endif()
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    214
    225INCLUDE_DIRECTORIES(
    23         ${LIBXML2_INCLUDE_DIR}
    246        ${CMAKE_CURRENT_SOURCE_DIR}/src
    25         ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported
    267        ${CMAKE_CURRENT_SOURCE_DIR}/../FlairCore/src
    278    ${CMAKE_CURRENT_SOURCE_DIR}/../FlairFilter/src
     
    2910)
    3011
    31 FILE(GLOB SRC_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
     12FILE(GLOB SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
    3213
    33 ADD_LIBRARY(${PROJECT_NAME}
    34         ${SRC_SRC}
     14FLAIR_LIB(${PROJECT_NAME} "${SRC_FILES}"
     15        INCLUDES_DEST_DIR ${PROJECT_NAME}
    3516)
    36 
    37 INSTALL(TARGETS ${PROJECT_NAME}
    38         LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    39         ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    40 )
    41 
    42 FILE(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h")
    43 INSTALL(FILES ${HEADER_FILES} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/${PROJECT_NAME})
    44 
    45 add_custom_target(
    46         ${PROJECT_NAME}_compile_info
    47         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
    48 )
    49 
    50 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)
    51 
    52 #else()
    53 #    if(DEFINED CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE)
    54 #        warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE} architecture")
    55 #    else()
    56 #        warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR} architecture")
    57 #    endif()
    58 #endif()
Note: See TracChangeset for help on using the changeset viewer.