Skip to content

fixed CMakeLists for Windows. adjustment for MSVC2017 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SternenKinder wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fixed CMakeLists for Windows. adjustment for MSVC2017 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f9b0eb
- fixed CMakeLists for Windows
Apr 11, 2018
2f1b812
[Quaternion]
thomasbochtler Sep 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion 3rd/log4cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
4 changes: 3 additions & 1 deletion 3rd/tinyxml/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion src/utMath/Quaternion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class UBITRACK_EXPORT Quaternion
{

friend class boost::serialization::access;

public:

typedef double value_type;
Expand Down