Changeset 302 in flair-src for trunk/lib/FlairSimulator


Ignore:
Timestamp:
02/25/19 16:28:34 (3 years ago)
Author:
Sanahuja Guillaume
Message:

modifs nouveau build system

Location:
trunk/lib/FlairSimulator
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • 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 {
Note: See TracChangeset for help on using the changeset viewer.