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

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

modifs nouveau build system

Location:

trunk/lib/FlairSimulator

Files:

• CMakeLists.txt (modified) (2 diffs)
• gl/CMakeLists.txt (modified) (1 diff)
• no_gl/CMakeLists.txt (modified) (1 diff)
• src/Parser.cpp (modified) (1 diff)
• src/Parser.h (modified) (1 diff)

trunk/lib/FlairSimulator/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(FlairSimulator)
 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()
-
 INCLUDE_DIRECTORIES(
-        ${LIBXML2_INCLUDE_DIR}
+        ${LIBXML2_INCLUDE_DIR}
         ${CMAKE_CURRENT_SOURCE_DIR}/src
         ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported
@@ -29 +16 @@
 )
 
-FILE(GLOB SIMU_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
-
-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
-)
+FILE(GLOB FLAIRSIMU_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/no_gl)
-add_dependencies(FlairSimulator_nogl ${PROJECT_NAME}_compile_info)
 if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/gl)
-add_dependencies(FlairSimulator_gl ${PROJECT_NAME}_compile_info)
 endif()

trunk/lib/FlairSimulator/gl/CMakeLists.txt

@@ -3 +3 @@
 ADD_DEFINITIONS(-D_GNU_SOURCE -D_REENTRANT -DGL)
 
-
-ADD_LIBRARY(${PROJECT_NAME}
-        ${SIMU_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}
-)
+FLAIR_LIB(${PROJECT_NAME} "${FLAIRSIMU_SRC}")

trunk/lib/FlairSimulator/no_gl/CMakeLists.txt

@@ -3 +3 @@
 ADD_DEFINITIONS(-D_GNU_SOURCE -D_REENTRANT)
 
-ADD_LIBRARY(${PROJECT_NAME}
-        ${SIMU_SRC}
-)
+FLAIR_LIB(${PROJECT_NAME} "${FLAIRSIMU_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-dev/include/FlairSimulator)
+INSTALL(FILES ${files} DESTINATION $ENV{FLAIR_ROOT}/flair-install/include/FlairSimulator)

trunk/lib/FlairSimulator/src/Parser.cpp

@@ -27 +27 @@
 #include <IGeometryCreator.h>
 #include <ISceneManager.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
 
 using namespace irr;

trunk/lib/FlairSimulator/src/Parser.h

@@ -20 +20 @@
 #include <Gui.h>
 #include <Vector3D.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
 #include <SColor.h>
+
+//todo make a pimpl to remove these forward declaration
+typedef struct _xmlNode xmlNode;
+typedef unsigned char xmlChar;
+typedef struct _xmlDoc xmlDoc;
 
 namespace flair {