From a52bb1d9b030ee888ab44b8ad9a2a2b8ebb909a3 Mon Sep 17 00:00:00 2001

From: Helio Chissini de Castro <helio@kde.org>

Date: Thu, 27 Apr 2017 17:19:51 +0200

Subject: [PATCH] - Apply mechanism to decide use for IrrXML external or

 internal

Several distributions usually decide for shared external libraries

instead of an usual embedded, for security reasons, duplicatiion issues.

This change enable the possibility to set SYSTEM_IRRXML=ON for detect

and build against a system installed irrxml.

By default, the internal copy is compiled.

Changes on build:

- Added a FindIrrXML cmake module.

- Moved the source recipe for proper CMakeLists inside contrib directory

- Includes aren't path based anymore, using the provided INCLUDE_DIR

- Compiler option are grouped in a singled entry on main CMakeLists

---

 CMakeLists.txt                 | 88 +++++++++++++++++++++++++++++++++++-------

 cmake-modules/FindIrrXML.cmake | 17 ++++++++

 code/CMakeLists.txt            | 20 +++-------

 code/irrXMLWrapper.h           |  6 +--

 contrib/CMakeLists.txt         |  4 ++

 contrib/irrXML/CMakeLists.txt  | 13 +++++++

 6 files changed, 116 insertions(+), 32 deletions(-)

 create mode 100644 cmake-modules/FindIrrXML.cmake

 create mode 100644 contrib/CMakeLists.txt

 create mode 100644 contrib/irrXML/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt

index 6989510..c2b3faa 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -39,7 +39,65 @@ SET(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required

 cmake_minimum_required( VERSION 2.8 )

 PROJECT( Assimp )

-OPTION(BUILD_SHARED_LIBS "Build package with shared libraries." ON)

+# All supported options ###############################################

+OPTION( BUILD_SHARED_LIBS

+  "Build package with shared libraries."

+  ON

+)

+OPTION( ASSIMP_DOUBLE_PRECISION

+  "Set to ON to enable double precision processing"

+  OFF

+)

+OPTION( ASSIMP_OPT_BUILD_PACKAGES

+  "Set to ON to generate CPack configuration files and packaging targets"

+  OFF

+)

+OPTION( ASSIMP_ANDROID_JNIIOSYSTEM

+  "Android JNI IOSystem support is active"

+  OFF

+)

+OPTION( ASSIMP_NO_EXPORT

+  "Disable Assimp's export functionality."

+  OFF

+)

+OPTION( ASSIMP_BUILD_ZLIB

+  "Build your own zlib"

+  OFF

+)

+option( ASSIMP_BUILD_ASSIMP_TOOLS

+  "If the supplementary tools for Assimp are built in addition to the library."

+  ON

+)

+option ( ASSIMP_BUILD_SAMPLES

+  "If the official samples are built as well (needs Glut)."

+  OFF

+)

+OPTION ( ASSIMP_BUILD_TESTS

+  "If the test suite for Assimp is built in addition to the library."

+  ON

+)

+OPTION ( ASSIMP_COVERALLS

+   "EaƄable this to measure test coverage."

+   OFF

+)

+

+option ( SYSTEM_IRRXML

+    "Use system installed Irrlicht/IrrXML library."

+    OFF

+)

+

+#OPTION ( BUILD_DOCS

+#   "Build documentation using Doxygen."

+#   OFF

+#)

+

+IF(MSVC)

+  set (CMAKE_PREFIX_PATH "D:\\libs\\devil")

+  OPTION( ASSIMP_INSTALL_PDB

+    "Install MSVC debug files."

+    ON

+  )

+ENDIF(MSVC)

 IF(NOT BUILD_SHARED_LIBS)

   SET(LINK_SEARCH_START_STATIC TRUE)

@@ -116,17 +174,17 @@ IF( UNIX )

     include(GNUInstallDirs)

 ENDIF( UNIX )

-IF((CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) AND NOT CMAKE_COMPILER_IS_MINGW)

-  IF (BUILD_SHARED_LIBS AND CMAKE_SIZEOF_VOID_P EQUAL 8) # -fPIC is only required for shared libs on 64 bit

-     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")

-  ENDIF()

+# Grouped compiler settings

+IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW)

   # hide all not-exported symbols

-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Wall -std=c++0x" )

+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fvisibility=hidden -fPIC -Wall -std=c++0x" )

+  SET(LIBSTDC++_LIBRARIES -lstdc++)

+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" )

 ELSEIF(MSVC)

   # enable multi-core compilation with MSVC

   add_compile_options(/MP)

-ELSEIF ( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )

-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Wall -Wno-long-long -pedantic -std=c++11" )

+ELSEIF ( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" )

+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fvisibility=hidden -fPIC -Wall -Wno-long-long -pedantic -std=c++11" )

 ELSEIF( CMAKE_COMPILER_IS_MINGW )

 	SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Wall -Wno-long-long -pedantic -std=c++11" )

 ENDIF()

@@ -176,14 +233,14 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake"             "${C

 FIND_PACKAGE( DirectX )

-OPTION ( ASSIMP_NO_EXPORT

-  "Disable Assimp's export functionality."

-  OFF

-)

+#IF( BUILD_DOCS )

+#    add_subdirectory(doc)

+#ENDIF( BUILD_DOCS )

-IF( CMAKE_COMPILER_IS_GNUCXX )

-  SET(LIBSTDC++_LIBRARIES -lstdc++)

-ENDIF( CMAKE_COMPILER_IS_GNUCXX )

+# Look for system installed irrXML

+IF ( SYSTEM_IRRXML )

+    find_package( IrrXML REQUIRED )

+ENDIF( SYSTEM_IRRXML )

 # Search for external dependencies, and build them from source if not found

 # Search for zlib

@@ -287,6 +344,7 @@ ELSE (ASSIMP_BUILD_NONFREE_C4D_IMPORTER)

   ADD_DEFINITIONS( -DASSIMP_BUILD_NO_C4D_IMPORTER )

 ENDIF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER)

+ADD_SUBDIRECTORY(contrib)

 ADD_SUBDIRECTORY( code/ )

 option ( ASSIMP_BUILD_ASSIMP_TOOLS

diff --git a/cmake-modules/FindIrrXML.cmake b/cmake-modules/FindIrrXML.cmake

new file mode 100644

index 0000000..5434e0b

--- /dev/null

+++ b/cmake-modules/FindIrrXML.cmake

@@ -0,0 +1,17 @@

+# Find IrrXMl from irrlicht project

+#

+# Find LibIrrXML headers and library

+#

+#   IRRXML_FOUND          - IrrXML found

+#   IRRXML_INCLUDE_DIR    - Headers location

+#   IRRXML_LIBRARY        - IrrXML main library

+

+find_path(IRRXML_INCLUDE_DIR irrXML.h

+    PATH_SUFFIXES include/irrlicht include/irrxml)

+find_library(IRRXML_LIBRARY IrrXML)

+

+include(FindPackageHandleStandardArgs)

+find_package_handle_standard_args(IrrXML REQUIRED_VARS IRRXML_INCLUDE_DIR IRRXML_LIBRARY)

+

+

+mark_as_advanced(IRRXML_INCLUDE_DIR IRRXML_LIBRARY)

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt

index 35ecf50..52073d1 100644

--- a/code/CMakeLists.txt

+++ b/code/CMakeLists.txt

@@ -542,6 +542,9 @@ SET( PostProcessing_SRCS

 )

 SOURCE_GROUP( PostProcessing FILES ${PostProcessing_SRCS})

+SET( IrrXML_SRCS irrXMLWrapper.h )

+SOURCE_GROUP( IrrXML FILES ${IrrXML_SRCS})

+

 ADD_ASSIMP_IMPORTER( Q3D

   Q3DLoader.cpp

   Q3DLoader.h

@@ -637,18 +640,6 @@ SET( Extra_SRCS

 )

 SOURCE_GROUP( Extra FILES ${Extra_SRCS})

-SET( IrrXML_SRCS

-  irrXMLWrapper.h

-  ../contrib/irrXML/CXMLReaderImpl.h

-  ../contrib/irrXML/heapsort.h

-  ../contrib/irrXML/irrArray.h

-  ../contrib/irrXML/irrString.h

-  ../contrib/irrXML/irrTypes.h

-  ../contrib/irrXML/irrXML.cpp

-  ../contrib/irrXML/irrXML.h

-)

-SOURCE_GROUP( IrrXML FILES ${IrrXML_SRCS})

-

 SET( ConvertUTF_SRCS

   ../contrib/ConvertUTF/ConvertUTF.h

   ../contrib/ConvertUTF/ConvertUTF.c

@@ -756,7 +747,8 @@ SET( assimp_src

 ADD_DEFINITIONS( -DOPENDDLPARSER_BUILD )

 INCLUDE_DIRECTORIES(

-  ../contrib/openddlparser/include

+    ${IRRXML_INCLUDE_DIR}

+    ../contrib/openddlparser/include

 )

 IF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER)

@@ -766,7 +758,7 @@ ENDIF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER)

 ADD_LIBRARY( assimp ${assimp_src} )

-TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} )

+TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} ${IRRXML_LIBRARY} )

 if(ANDROID AND ASSIMP_ANDROID_JNIIOSYSTEM)

   set(ASSIMP_ANDROID_JNIIOSYSTEM_PATH port/AndroidJNI)

diff --git a/code/irrXMLWrapper.h b/code/irrXMLWrapper.h

index 41e4188..9d96456 100644

--- a/code/irrXMLWrapper.h

+++ b/code/irrXMLWrapper.h

@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #define INCLUDED_AI_IRRXML_WRAPPER

 // some long includes ....

-#include "./../contrib/irrXML/irrXML.h"

+#include <irrXML.h>

 #include "./../include/assimp/IOStream.hpp"

 #include "BaseImporter.h"

 #include <vector>

@@ -128,8 +128,8 @@ public:

     // ----------------------------------------------------------------------------------

     //! Returns size of file in bytes

-    virtual int getSize()   {

-        return (int)data.size();

+    virtual long getSize() const {

+        return (long)data.size();

     }

 private:

diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt

new file mode 100644

index 0000000..362f165

--- /dev/null

+++ b/contrib/CMakeLists.txt

@@ -0,0 +1,4 @@

+# Compile internal irrXML only if system is not requested

+if( NOT SYSTEM_IRRXML )

+    add_subdirectory(irrXML)

+endif( NOT SYSTEM_IRRXML )

diff --git a/contrib/irrXML/CMakeLists.txt b/contrib/irrXML/CMakeLists.txt

new file mode 100644

index 0000000..82ede3a

--- /dev/null

+++ b/contrib/irrXML/CMakeLists.txt

@@ -0,0 +1,13 @@

+set( IrrXML_SRCS

+  CXMLReaderImpl.h

+  heapsort.h

+  irrArray.h

+  irrString.h

+  irrTypes.h

+  irrXML.cpp

+  irrXML.h

+)

+

+add_library(IrrXML STATIC ${IrrXML_SRCS})

+set(IRRXML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "IrrXML_Include" )

+set(IRRXML_LIBRARY "IrrXML" CACHE INTERNAL "IrrXML" )

-- 

2.9.3