Skip to content

Enhanced CMake support#42

Open
cdglove wants to merge 2 commits into
idmillington:masterfrom
cdglove:cmake_support
Open

Enhanced CMake support#42
cdglove wants to merge 2 commits into
idmillington:masterfrom
cdglove:cmake_support

Conversation

@cdglove
Copy link
Copy Markdown

@cdglove cdglove commented Nov 25, 2016

Enhanced @Amorph initial CMake support with support for other platforms. Also added x64 support to timing.cpp

  • Add platform support
  • Add option to copy built files to win32 directory
  • Switch to freeglut (adds win64 support)
  • Fix a bug where cmake include paths weren't correctly setup in demo exes.
  • Add new win32 binaries built against freeglut.
  • Add x64 support to timing.cpp

I recommend deleting the current build files and using only cmake. I will prbably make that change and submit another PR.

Amorph and others added 2 commits October 22, 2014 22:01
- Add platform support
- Add option to copy built files to win32 directory
- Switch to freeglut (adds win64 support)
- Fix a bug where cmake include paths weren't correctly setup in demo exes.
- Add new win32 binaries built againt freeglut.
- Add x64 support to timing.cpp
@herdinstinct
Copy link
Copy Markdown

Is there a way I can get your commits without the author merging?

@cdglove
Copy link
Copy Markdown
Author

cdglove commented Dec 3, 2016

Yes, just pull from my repository:
git pull git@github.com:cdglove/cyclone-physics.git cmake_support
or
git pull https://github.com/cdglove/cyclone-physics.git cmake_support

@momadacoding
Copy link
Copy Markdown

I pulled this request locally, but got an error when run CMake:
CMake Error at src/demos/CMakeLists.txt:11 (file): file COPY given no DESTINATION
@cdglove Do you know what's this error

@ButchDean
Copy link
Copy Markdown
Contributor

You could try at line 11:

configure_file(${CMAKE_SOURCE_DIR}/contrib/freeglut/bin/x64/freeglut.dll ${CMAKE_CURRENT_BINARY_DIR}/freeglut.dll COPYONLY)

and likewise for line 15.

I haven't tested this but this is how I usually copy files in CMake.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants