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

Timestamp:

Feb 25, 2019, 4:28:34 PM (6 years ago)

Author:

Sanahuja Guillaume

Message:

modifs nouveau build system

Location:

trunk/lib/FlairCore

Files:

• CMakeLists.txt (modified) (2 diffs)
• nrt/CMakeLists.txt (modified) (1 diff)
• rt/CMakeLists.txt (modified) (1 diff)
• src/Widget.h (modified) (1 diff)

trunk/lib/FlairCore/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(FlairCore)
 cmake_minimum_required(VERSION 2.8)
-include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
+include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
 
 find_package(LibXml2 REQUIRED)
-
-execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-                OUTPUT_VARIABLE GCC_VERSION)
-
-if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
-        if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
-                ADD_DEFINITIONS("-std=c++11")
-        else()
-                ADD_DEFINITIONS("-std=c++0x")
-        endif()
-else()
-        message(STATUS "GCC version < 4.3, c+11 is not supported!")
-endif()
 
 FILE(GLOB FLAIRCORE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
@@ -29 +16 @@
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/nrt)
-if(NOT WIN32)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/rt)
-endif()
-
-add_custom_target(
-        ${PROJECT_NAME}_compile_info
-        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
-)
-
-add_dependencies(FlairCore_rt ${PROJECT_NAME}_compile_info)
-add_dependencies(FlairCore_nrt ${PROJECT_NAME}_compile_info)

trunk/lib/FlairCore/nrt/CMakeLists.txt

@@ -3 +3 @@
 ADD_DEFINITIONS(-D_GNU_SOURCE -D_REENTRANT)
 
-ADD_LIBRARY(${PROJECT_NAME}
-        ${FLAIRCORE_SRC}
-)
+FLAIR_LIB(${PROJECT_NAME} "${FLAIRCORE_SRC}")
 
-INSTALL(TARGETS ${PROJECT_NAME}
-        LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
-        ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
-)
+#install here, as FLAIR_LIB function will not find .h (in ../src)
+FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/../src/*.h")
+INSTALL(FILES ${files} DESTINATION $ENV{FLAIR_ROOT}/flair-install/include/FlairCore)

trunk/lib/FlairCore/rt/CMakeLists.txt

@@ -8 +8 @@
 )
 
-ADD_LIBRARY(${PROJECT_NAME}
-        ${FLAIRCORE_SRC}
-)
+FLAIR_LIB(${PROJECT_NAME} "${FLAIRCORE_SRC}")
 
-INSTALL(TARGETS ${PROJECT_NAME}
-        LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
-        ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
-)
-
-FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/../src/*.h")
-INSTALL(FILES ${files} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/FlairCore)

trunk/lib/FlairCore/src/Widget.h

@@ -15 +15 @@
 
 #include <Object.h>
-//#include <io_data.h>
-#include <libxml/xpath.h>
 
 class Widget_impl;
 class FrameworkManager_impl;
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
 
 namespace flair {