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


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

modifs nouveau build system

Location:
trunk/lib/FlairCore
Files:
4 edited

Legend:

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