TinyXml2 with superbuild git add CMakeLists.txt SCHNApps/CMakeLists.txt ThirdParty/CMakeLists.txt

CMakeLists.txt

@@ -9,6 +9,29 @@ SET ( CGoGN_ROOT_DIR ${CMAKE_SOURCE_DIR} )
 SET ( CMAKE_MODULE_PATH ${CGoGN_ROOT_DIR}/cmake_modules/ )
 
 
+# ====== Check GCC VERSION FOR C++11 ======
+if(CMAKE_COMPILER_IS_GNUCXX)
+	execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+	if (GCC_VERSION VERSION_LESS 4.8)
+		message(FATAL_ERROR "Full support of C++11 needed. Therefore a gcc/g++ compiler with a version at least 4.8 is needed.")
+	endif()
+endif()
+
+# ====== Check CLANG VERSION FOR C++11 ======
+if (APPLE)
+	execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE CLANG_VERSION)
+	if (CLANG_VERSION VERSION_LESS 3.1)
+		message(FATAL_ERROR "Full support of C++11 needed. Therefore a clang compiler with a version at least 3.1 is needed !!")
+	endif()
+endif()
+
+# ====== Check MSVC VERSION FOR C++11 ======
+if(WIN32)
+	if(MSVC_VERSION LESS 1800)
+		message(FATAL_ERROR "Full support of C++11 needed. Therefore a microsoft compiler with a version at least 12 is needed.")
+	endif()
+endif()
+
 
 IF (NOT (${CMAKE_BUILD_TYPE} MATCHES "Debug|Release"))
 	IF (${CMAKE_CURRENT_BINARY_DIR} MATCHES "(.*)Debug|(.*)debug|(.*)DEBUG")
@@ -58,8 +81,6 @@ ENDIF(WIN32)
 find_package(OpenGL REQUIRED)
 find_package(Boost COMPONENTS regex REQUIRED)
 find_package(ZLIB REQUIRED)
-#find_package(LibXml2 REQUIRED)
-find_package(TinyXml2 REQUIRED)
 find_package(GLEW REQUIRED)
 
 # MESSAGE HERE FOR MORE EASY USER READING
@@ -99,7 +120,6 @@ SET (CGoGN_EXT_INCLUDES
 	${OPENGL_INCLUDE_DIR}
 	${GLEW_INCLUDE_DIRS}
 	${ZLIB_INCLUDE_DIRS}
-	${TINYXML2_INCLUDE_DIR}
 	${Boost_INCLUDE_DIRS}
 )
 
@@ -109,8 +129,8 @@ SET (CGoGN_EXT_LIBS
 	${OPENGL_LIBRARY}
 	${GLEW_LIBRARIES}
 	${ZLIB_LIBRARIES}
-	${TINYXML2_LIBRARY}
 	${Boost_REGEX_LIBRARY}
+	tinyxml2
 )
 
 IF(WIN32)

SCHNApps/CMakeLists.txt

@@ -23,7 +23,6 @@ SET( USE_OGL_CORE_PROFILE OFF CACHE BOOL "use OpenGL 3.3 core profile (do not wo
 find_package(OpenGL REQUIRED)
 find_package(Boost COMPONENTS regex system REQUIRED)
 find_package(ZLIB REQUIRED)
-find_package(LibXml2 REQUIRED)
 find_package(GLEW REQUIRED)
 find_package(Qt4 REQUIRED)
 find_package(QGLViewer REQUIRED)
@@ -73,7 +72,6 @@ SET (EXT_INCLUDES
 	${OPENGL_INCLUDE_DIR}
 	${GLEW_INCLUDE_DIRS}
 	${ZLIB_INCLUDE_DIRS}
-	${LIBXML2_INCLUDE_DIR}
 	${Boost_INCLUDE_DIRS}
 	${QT_INCLUDE_DIR}
 	${QGLVIEWER_INCLUDE_DIR}
@@ -86,17 +84,17 @@ SET (EXT_INCLUDES
 SET (EXT_LIBS 
 	PythonQt
 	nl
+	${QGLVIEWER_LIBRARIES}
 	${OPENGL_LIBRARY}
 	${GLEW_LIBRARIES}
 	${ZLIB_LIBRARIES}
-	${LIBXML2_LIBRARIES}
 	${Boost_SYSTEM_LIBRARY}
 	${Boost_REGEX_LIBRARY}
 	${QT_LIBRARIES}
-	${QGLVIEWER_LIBRARIES}
 	${PYTHON_LIBRARIES}
 	${SUITESPARSE_LIBRARIES}
 #	${SUPERLU_LIBRARIES}
+	tinyxml2
 )
 
 

ThirdParty/CMakeLists.txt

 cmake_minimum_required(VERSION 2.8)
+include(ExternalProject)
 
 project(CGoGN_ThirdParty)
 
+
+
 SET(CGoGN_ROOT_DIR ${CMAKE_SOURCE_DIR}/..)
 
 IF(WIN32)
@@ -36,6 +39,7 @@ ENDIF(WIN32)
 SET (BUILD_SHARED_LIBS OFF CACHE BOOL 
 	"if used all library are build as shared type (.so/.dylib/.dll)")
 
+SET (WITH_TINYXML2 ON CACHE BOOL "get & build tinyxml2")
 SET (WITH_ASSIMP OFF CACHE BOOL "build with Assimp")
 SET (WITH_ZINRI ON CACHE BOOL "build with Zinri libs")
 SET (WITH_PYTHONQT ON CACHE BOOL "build PythonQt (for Schnapps)")
@@ -67,5 +71,16 @@ IF (WITH_ASSIMP)
 	INSTALL (DIRECTORY Assimp/include/ DESTINATION ${CGoGN_ROOT_DIR}/ThirdParty/include/Assimp)
 ENDIF (WITH_ASSIMP)
 
-
-
+IF (WITH_TINYXML2)
+	ExternalProject_Add(
+		Tinyxml2
+		PREFIX ${CMAKE_CURRENT_BINARY_DIR}/tinyxml2
+		GIT_REPOSITORY https://github.com/leethomason/tinyxml2.git
+		CMAKE_CACHE_ARGS "-DCMAKE_BUILD_TYPE:string=${CMAKE_BUILD_TYPE}"
+		CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CGoGN_ROOT_DIR}/ThirdParty/TinyXml2"
+		BUILD_COMMAND make
+		INSTALL_COMMAND make install
+	)
+	INSTALL (DIRECTORY TinyXml2/include/ DESTINATION ${CGoGN_ROOT_DIR}/ThirdParty/include)
+	INSTALL (DIRECTORY TinyXml2/lib/ DESTINATION ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE})
+ENDIF (WITH_TINYXML2)
\ No newline at end of file