diff -Naurp a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt 2013-08-20 16:07:46.753736070 +0400 +++ b/CMakeLists.txt 2013-08-20 16:09:29.163587982 +0400 @@ -244,9 +244,6 @@ else () # if pcre not found building it endif () # building required libs -add_subdirectory(common/libftoa) -add_subdirectory(common/libBuffer) -add_subdirectory(${EXTERNAL_LIBRARIES}/UTF) add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver) # building OpenCOLLADA libs diff -Naurp a/COLLADABaseUtils/CMakeLists.txt b/COLLADABaseUtils/CMakeLists.txt --- a/COLLADABaseUtils/CMakeLists.txt 2013-04-13 13:05:06.000000000 +0400 +++ b/COLLADABaseUtils/CMakeLists.txt 2013-08-20 16:09:29.163587982 +0400 @@ -7,6 +7,14 @@ set(libBaseUtils_include_dirs ) set(libBaseUtils_include_dirs ${libBaseUtils_include_dirs} PARENT_SCOPE) # adding include dirs to a parent scope + +SET(libUTF_include_dirs + ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/UTF/include/ +) + +SET(libUTF_src_dirs + ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/UTF/src/ +) set(INST_SRC include/COLLADABUIDList.h @@ -47,13 +55,13 @@ set(SRC src/Math/COLLADABUMathUtils.cpp src/Math/COLLADABUMathQuaternion.cpp src/Math/COLLADABUMathMatrix4.cpp + ${libUTF_src_dirs}/ConvertUTF.c ${INST_SRC} ${INST_MATH_SRC} ) set(TARGET_LIBS - UTF ${PCRE_LIBRARIES} ) diff -Naurp a/COLLADAStreamWriter/CMakeLists.txt b/COLLADAStreamWriter/CMakeLists.txt --- a/COLLADAStreamWriter/CMakeLists.txt 2013-04-13 13:05:07.000000000 +0400 +++ b/COLLADAStreamWriter/CMakeLists.txt 2013-08-20 16:09:29.163587982 +0400 @@ -1,12 +1,36 @@ set(name OpenCOLLADAStreamWriter) project(${name}) +SET(libBuffer_include_dirs + ${CMAKE_CURRENT_SOURCE_DIR}/../common/libBuffer/include/ +) + +SET(libftoa_include_dirs + ${CMAKE_CURRENT_SOURCE_DIR}/../common/libftoa/include/ +) + +SET(libUTF_include_dirs + ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/UTF/include/ +) + set(libStreamWriter_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}/include ) set(libStreamWriter_include_dirs ${libStreamWriter_include_dirs} PARENT_SCOPE) # adding include dirs to a parent scope +SET(libBuffer_src_dirs + ${CMAKE_CURRENT_SOURCE_DIR}/../common/libBuffer/src/ +) + +SET(libftoa_src_dirs + ${CMAKE_CURRENT_SOURCE_DIR}/../common/libftoa/src/ +) + +SET(libUTF_src_dirs + ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/UTF/src/ +) + set(INST_SRC include/COLLADASWAnnotation.h include/COLLADASWAsset.h @@ -124,14 +148,22 @@ set(SRC src/COLLADASWElementWriter.cpp src/COLLADASWLibrary.cpp src/COLLADASWConstants.cpp + # Include libftoa and libBuffer files here. + ${libBuffer_src_dirs}/CommonBuffer.cpp + ${libBuffer_src_dirs}/CommonCharacterBuffer.cpp + ${libBuffer_src_dirs}/CommonFWriteBufferFlusher.cpp + ${libBuffer_src_dirs}/CommonStreamBufferFlusher.cpp + ${libftoa_src_dirs}/Commondtoa.cpp + ${libftoa_src_dirs}/Commonftoa.cpp + ${libftoa_src_dirs}/Commonitoa.cpp + ${libUTF_src_dirs}/ConvertUTF.c + ${INST_SRC} ) set(TARGET_LIBS OpenCOLLADABaseUtils - buffer - ftoa ) include_directories( @@ -139,6 +171,7 @@ include_directories( ${libBaseUtils_include_dirs} ${libftoa_include_dirs} ${libBuffer_include_dirs} + ${libUTF_include_dirs} ) opencollada_add_lib(${name} "${SRC}" "${TARGET_LIBS}") diff -Naurp a/COLLADAValidator/CMakeLists.txt b/COLLADAValidator/CMakeLists.txt --- a/COLLADAValidator/CMakeLists.txt 2013-04-13 13:05:07.000000000 +0400 +++ b/COLLADAValidator/CMakeLists.txt 2013-08-20 16:09:29.163587982 +0400 @@ -23,7 +23,6 @@ set(libValidator_libs MathMLSolver ${PCRE_LIBRARIES} ${LIBXML2_LIBRARIES} - UTF ) include_directories( diff -Naurp a/OpenCOLLADAConfig.cmake.in b/OpenCOLLADAConfig.cmake.in --- a/OpenCOLLADAConfig.cmake.in 2013-08-15 16:35:27.000000000 +0400 +++ b/OpenCOLLADAConfig.cmake.in 2013-08-20 16:11:30.933033222 +0400 @@ -33,9 +33,6 @@ include("@PACKAGE_OPENCOLLADA_INST_CMAKE # Set the library variable if(UNIX) set(OPENCOLLADA_LIBRARIES - ftoa_shared - buffer_shared - UTF_shared MathMLSolver_shared OpenCOLLADABaseUtils_shared OpenCOLLADAFramework_shared @@ -45,9 +42,6 @@ if(UNIX) ) else() set(OPENCOLLADA_LIBRARIES - ftoa_static - buffer_static - UTF_static MathMLSolver_static OpenCOLLADABaseUtils_static OpenCOLLADAFramework_static