From 1f9b0eb34eaf84f0aea88376e80ae7e57a6d2336 Mon Sep 17 00:00:00 2001 From: SternenKind Date: Wed, 11 Apr 2018 17:20:46 +0200 Subject: [PATCH 1/2] - fixed CMakeLists for Windows - adjustment for MSVC2017 --- 3rd/log4cpp/CMakeLists.txt | 3 ++- 3rd/tinyxml/CMakeLists.txt | 4 +++- src/utMath/Quaternion.h | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/3rd/log4cpp/CMakeLists.txt b/3rd/log4cpp/CMakeLists.txt index 5c9e363..e29f25e 100644 --- a/3rd/log4cpp/CMakeLists.txt +++ b/3rd/log4cpp/CMakeLists.txt @@ -34,12 +34,13 @@ FILE(GLOB LOG4CPP_HEADERS RELATIVE "${LOG4CPP_SOURCE_DIR}" "${LOG4CPP_SOURCE_DIR}/include/*/*/*.hh" ) +IF(UNIX) FIND_PACKAGE(PTHREAD REQUIRED) IF(PTHREAD_FOUND) INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ) SET(requiredLibs ${requiredLibs} ${PTHREAD_LIBRARIES} ) ENDIF(PTHREAD_FOUND) - +ENDIF(UNIX) # LOG4CPP shared library definition ADD_LIBRARY(${LOG4CPP_LIBRARY} SHARED ${LOG4CPP_SRCS} ${LOG4CPP_HEADERS}) diff --git a/3rd/tinyxml/CMakeLists.txt b/3rd/tinyxml/CMakeLists.txt index cf1e051..cd6e591 100644 --- a/3rd/tinyxml/CMakeLists.txt +++ b/3rd/tinyxml/CMakeLists.txt @@ -32,11 +32,13 @@ FILE(GLOB TINYXML_HEADERS RELATIVE "${TINYXML_SOURCE_DIR}" "${TINYXML_SOURCE_DIR}/*.h" ) + +IF(UNIX) FIND_PACKAGE(PTHREAD REQUIRED) IF(PTHREAD_FOUND) SET(HAVE_PTHREAD 1) ENDIF(PTHREAD_FOUND) - +ENDIF(UNIX) # TINYXML shared library definition ADD_LIBRARY(${TINYXML_LIBRARY} STATIC ${TINYXML_SRCS} ${TINYXML_HEADERS}) diff --git a/src/utMath/Quaternion.h b/src/utMath/Quaternion.h index 2588f54..59809ca 100644 --- a/src/utMath/Quaternion.h +++ b/src/utMath/Quaternion.h @@ -61,7 +61,8 @@ class UBITRACK_EXPORT Quaternion { friend class boost::serialization::access; - +protected: + double a, b, c, d; public: typedef double value_type; From 2f1b812a557e7296010bef7a2b2ad633a3d9a615 Mon Sep 17 00:00:00 2001 From: tbochtl Date: Thu, 13 Sep 2018 17:56:38 +0200 Subject: [PATCH 2/2] [Quaternion] (-) removed duplicated member variable --- src/utMath/Quaternion.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/utMath/Quaternion.h b/src/utMath/Quaternion.h index 59809ca..aaa645f 100644 --- a/src/utMath/Quaternion.h +++ b/src/utMath/Quaternion.h @@ -61,8 +61,7 @@ class UBITRACK_EXPORT Quaternion { friend class boost::serialization::access; -protected: - double a, b, c, d; + public: typedef double value_type;