Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:12.1:Update
openCOLLADA
openCOLLADA-cmakelinuxbuild.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File openCOLLADA-cmakelinuxbuild.patch of Package openCOLLADA
Index: CMakeLists.txt =================================================================== --- CMakeLists.txt.orig 2011-01-18 16:00:57.000000000 +0200 +++ CMakeLists.txt 2011-05-08 14:51:39.940765571 +0200 @@ -66,9 +66,6 @@ ELSE (PCRE_FOUND) #if pcre not found bui ENDIF (PCRE_FOUND) #building required libs -ADD_SUBDIRECTORY(common/libftoa) -ADD_SUBDIRECTORY(common/libBuffer) -ADD_SUBDIRECTORY(${EXTERNAL_LIBRARIES}/UTF) ADD_SUBDIRECTORY(${EXTERNAL_LIBRARIES}/MathMLSolver) #building OpenCOLLADA libs @@ -79,4 +76,4 @@ ADD_SUBDIRECTORY(COLLADASaxFrameworkLoad ADD_SUBDIRECTORY(COLLADAStreamWriter) #building COLLADAValidator app -ADD_SUBDIRECTORY(COLLADAValidator) +#ADD_SUBDIRECTORY(COLLADAValidator) Index: COLLADABaseUtils/CMakeLists.txt =================================================================== --- COLLADABaseUtils/CMakeLists.txt.orig 2010-11-16 09:54:39.000000000 +0200 +++ COLLADABaseUtils/CMakeLists.txt 2011-05-08 14:52:59.935138523 +0200 @@ -1,5 +1,6 @@ SET(name OpenCOLLADABaseUtils) PROJECT(${name}) +add_definitions(-O2) SET(libBaseUtils_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}/include/ @@ -8,17 +9,25 @@ 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(libBaseUtils_src_dirs ${CMAKE_CURRENT_SOURCE_DIR}/src/ ) +SET(libUTF_src_dirs + ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/UTF/src/ +) + file(GLOB_RECURSE libBaseUtils_src_files ${libBaseUtils_src_dirs}/*.cpp ${libBaseUtils_src_dirs}/*.h + ${libUTF_src_dirs}/*.c ) SET(libBaseUtils_libs - UTF ${PCRE_LIBRARIES} ) @@ -40,10 +49,8 @@ IF (USE_SHARED) message(${name} " WARNING: Shared library support implemented for UNIX-like OS only") ENDIF (NOT UNIX) ADD_LIBRARY(${name}_shared SHARED ${libBaseUtils_src_files}) - SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name}) + SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${soversion}.${soage}.${sorevision}) TARGET_LINK_LIBRARIES(${name}_shared ${libBaseUtils_libs}) SET(CMAKE_REQUIRED_LIBRARIES "${name}_shared;${CMAKE_REQUIRED_LIBRARIES}" PARENT_SCOPE) ENDIF (USE_SHARED) - - Index: COLLADAFramework/CMakeLists.txt =================================================================== --- COLLADAFramework/CMakeLists.txt.orig 2010-11-16 09:54:39.000000000 +0200 +++ COLLADAFramework/CMakeLists.txt 2011-05-08 14:53:56.784743433 +0200 @@ -1,6 +1,8 @@ SET(name OpenCOLLADAFramework) PROJECT(${name}) +add_definitions(-O2) + SET(libFramework_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}/include/ ) @@ -36,7 +38,7 @@ IF (USE_SHARED) message(${name} " WARNING: Shared library support implemented for UNIX-like OS only") ENDIF (NOT UNIX) ADD_LIBRARY(${name}_shared SHARED ${libFramework_src_files}) - SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name}) + SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${soversion}.${soage}.${sorevision}) TARGET_LINK_LIBRARIES(${name}_shared ${libFramework_libs}) SET(CMAKE_REQUIRED_LIBRARIES "${name}_shared;${CMAKE_REQUIRED_LIBRARIES}" PARENT_SCOPE) ENDIF (USE_SHARED) Index: COLLADASaxFrameworkLoader/CMakeLists.txt =================================================================== --- COLLADASaxFrameworkLoader/CMakeLists.txt.orig 2010-11-16 09:54:39.000000000 +0200 +++ COLLADASaxFrameworkLoader/CMakeLists.txt 2011-05-08 18:32:42.808378644 +0200 @@ -1,4 +1,5 @@ SET(name OpenCOLLADASaxFrameworkLoader) + PROJECT(${name}) SET(libSaxFrameworkLoader_include_dirs @@ -43,7 +44,8 @@ INCLUDE_DIRECTORIES( ${libFramework_include_dirs} ${libGeneratedSaxParser_include_dirs} ${PCRE_INCLUDE_DIR} -) +) + LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH}) IF (USE_STATIC) @@ -58,7 +60,8 @@ IF (USE_SHARED) message(${name} " WARNING: Shared library support implemented for UNIX-like OS only") ENDIF (NOT UNIX) ADD_LIBRARY(${name}_shared SHARED ${libSaxFrameworkLoader_src_files}) - SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name}) + SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${soversion}.${soage}.${sorevision}) TARGET_LINK_LIBRARIES(${name}_shared ${libSaxFrameworkLoader_libs}) SET(CMAKE_REQUIRED_LIBRARIES "${name}_shared;${CMAKE_REQUIRED_LIBRARIES}" PARENT_SCOPE) + add_dependencies(${name}_shared;${CMAKE_REQUIRED_LIBRARIES}) ENDIF (USE_SHARED) \ No newline at end of file Index: COLLADAStreamWriter/CMakeLists.txt =================================================================== --- COLLADAStreamWriter/CMakeLists.txt.orig 2010-11-16 09:54:39.000000000 +0200 +++ COLLADAStreamWriter/CMakeLists.txt 2011-05-08 14:54:52.064635301 +0200 @@ -1,30 +1,53 @@ SET(name OpenCOLLADAStreamWriter) PROJECT(${name}) +add_definitions(-O2) + 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(libStreamWriter_src_dirs +SET(libBuffer_include_dirs + ${CMAKE_CURRENT_SOURCE_DIR}/../common/libBuffer/include/ +) + +SET(libftoa_include_dirs + ${CMAKE_CURRENT_SOURCE_DIR}/../common/libftoa/include/ +) + +SET(libStreamWriter_src_dirs ${CMAKE_CURRENT_SOURCE_DIR}/src/ ) -file(GLOB_RECURSE libStreamWriterLoader_src_files +SET(libBuffer_src_dirs + ${CMAKE_CURRENT_SOURCE_DIR}/../common/libBuffer/src/ +) + +SET(libftoa_src_dirs + ${CMAKE_CURRENT_SOURCE_DIR}/../common/libftoa/src/ +) + +file(GLOB_RECURSE libStreamWriterLoader_src_files ${libStreamWriter_src_dirs}/*.cpp ${libStreamWriter_src_dirs}/*.h + ${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 ) SET(libStreamWriter_libs - OpenCOLLADABaseUtils - buffer - ftoa + OpenCOLLADABaseUtils ) -INCLUDE_DIRECTORIES(${libStreamWriter_include_dirs} - ${libBaseUtils_include_dirs} - ${libftoa_include_dirs} +INCLUDE_DIRECTORIES(${libStreamWriter_include_dirs} + ${libBaseUtils_include_dirs} + ${libftoa_include_dirs} ${libBuffer_include_dirs} ) @@ -42,7 +65,7 @@ IF (USE_SHARED) message(${name} " WARNING: Shared library support implemented for UNIX-like OS only") ENDIF (NOT UNIX) ADD_LIBRARY(${name}_shared SHARED ${libStreamWriterLoader_src_files}) - SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name}) + SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${soversion}.${soage}.${sorevision}) TARGET_LINK_LIBRARIES(${name}_shared ${libStreamWriter_libs}) SET(CMAKE_REQUIRED_LIBRARIES "${name}_shared;${CMAKE_REQUIRED_LIBRARIES}" PARENT_SCOPE) ENDIF (USE_SHARED) Index: COLLADAValidator/CMakeLists.txt =================================================================== --- COLLADAValidator/CMakeLists.txt.orig 2010-11-16 09:54:39.000000000 +0200 +++ COLLADAValidator/CMakeLists.txt 2011-05-05 19:19:20.588229658 +0200 @@ -24,7 +24,6 @@ SET(libValidator_libs MathMLSolver ${PCRE_LIBRARIES} ${LIBXML2_LIBRARIES} - UTF ) INCLUDE_DIRECTORIES( Index: Externals/MathMLSolver/CMakeLists.txt =================================================================== --- Externals/MathMLSolver/CMakeLists.txt.orig 2010-11-16 09:54:39.000000000 +0200 +++ Externals/MathMLSolver/CMakeLists.txt 2011-05-08 14:57:08.764638926 +0200 @@ -1,5 +1,7 @@ SET(name MathMLSolver) PROJECT(${name}) + +add_definitions(-O2) SET(libMathMLSolver_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}/include/ @@ -34,7 +36,7 @@ IF (USE_SHARED) message(${name} " WARNING: Shared library support implemented for UNIX-like OS only") ENDIF (NOT UNIX) ADD_LIBRARY(${name}_shared SHARED ${libMathMLSolver_src_files}) - SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name}) + SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${soversion}.${soage}.${sorevision}) TARGET_LINK_LIBRARIES(${name}_shared ${libMathMLSolver_libs}) SET(CMAKE_REQUIRED_LIBRARIES "${name}_shared;${CMAKE_REQUIRED_LIBRARIES}" PARENT_SCOPE) ENDIF (USE_SHARED) Index: GeneratedSaxParser/CMakeLists.txt =================================================================== --- GeneratedSaxParser/CMakeLists.txt.orig 2010-11-16 09:54:39.000000000 +0200 +++ GeneratedSaxParser/CMakeLists.txt 2011-05-08 14:55:51.565755231 +0200 @@ -1,6 +1,8 @@ SET(name GeneratedSaxParser) PROJECT(${name}) +add_definitions(-O2) + SET(libGeneratedSaxParser_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}/include/ ) @@ -59,7 +61,8 @@ IF (USE_SHARED) message(${name} " WARNING: Shared library support implemented for UNIX-like OS only") ENDIF (NOT UNIX) ADD_LIBRARY(${name}_shared SHARED ${libGeneratedSaxParser_src_files}) - SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name}) + SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${soversion}.${soage}.${sorevision}) TARGET_LINK_LIBRARIES(${name}_shared ${libGeneratedSaxParser_libs}) SET(CMAKE_REQUIRED_LIBRARIES "${name}_shared;${CMAKE_REQUIRED_LIBRARIES}" PARENT_SCOPE) + add_dependencies(${name}_shared;${CMAKE_REQUIRED_LIBRARIES}) ENDIF (USE_SHARED) Index: Externals/UTF/CMakeLists.txt =================================================================== --- Externals/UTF/CMakeLists.txt.orig 2010-11-16 09:54:39.000000000 +0200 +++ Externals/UTF/CMakeLists.txt 2011-05-08 15:23:05.679495969 +0200 @@ -1,6 +1,8 @@ SET(name UTF) PROJECT(${name}) +add_definitions(-O2) + SET(libUTF_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}/include/ )
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor