Skip to content

Commit

Permalink
Merge pull request wdas#28 from nyue/master
Browse files Browse the repository at this point in the history
* nyue/master:
  Fix M_PI undefined on Windows by including the correct header
  Fix GLUT include directory path handling Fix Windows installation variant directory specification
  Fix installation command copying generated python file from the wrong location

Signed-off-by: David Aguilar <[email protected]>
  • Loading branch information
davvid committed Apr 18, 2019
2 parents 74f4ee0 + 4915a77 commit 9bd83ad
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
8 changes: 6 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,12 @@ enable_testing()

## Set install location
IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
EXECUTE_PROCESS(COMMAND sh -c "echo `uname`-`uname -r | cut -d'-' -f1`-`uname -m`" OUTPUT_VARIABLE VARIANT_DIRECTORY OUTPUT_STRIP_TRAILING_WHITESPACE)
SET(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/${VARIANT_DIRECTORY}")
IF(WIN32)
set(VARIANT_DIRECTORY "Windows-x86_64")
ELSE()
execute_process(COMMAND sh -c "echo `uname`-`uname -r | cut -d'-' -f1`-`uname -m`" OUTPUT_VARIABLE VARIANT_DIRECTORY OUTPUT_STRIP_TRAILING_WHITESPACE)
ENDIF()
set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/${VARIANT_DIRECTORY}")
ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)

include(GNUInstallDirs)
Expand Down
5 changes: 5 additions & 0 deletions src/tools/Camera.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

#include <PartioVec3.h>

#ifdef WIN32
#define _USE_MATH_DEFINES
#include <math.h>
#endif //

#ifdef PARTIO_WIN32
#define M_PI 3.141592653589793238
#endif
Expand Down

0 comments on commit 9bd83ad

Please sign in to comment.