Skip to content
This repository has been archived by the owner on Jan 18, 2021. It is now read-only.

s/Makefile/CMakelists.txt #8

Merged
merged 17 commits into from
Jul 18, 2018
Merged

Conversation

ianklatzco
Copy link
Contributor

Mostly a straightforward port of the Makefile. I've tested lightly (running grrshot on a binary out of cb-multios, compiled for linux/decree, debug/release) and things appear to be correct.

@CLAassistant
Copy link

CLAassistant commented Jul 10, 2018

CLA assistant check
All committers have signed the CLA.

CMakeLists.txt Outdated
enable_language(ASM)

# What compilers are we using?
set(CMAKE_C_COMPILER "clang-3.8")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This I think is the one change I'd like to see. Can you see if you can detect if the cmake compiler is not a variant of clang, and error out? Hard-coding clang 3.8 should not be necessary anymore.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 395631b.

CMakeLists.txt Outdated
set(CMAKE_C_COMPILER "clang-3.8")
set(CMAKE_CXX_COMPILER "clang++-3.8")
set(CMAKE_ASM_COMPILER "clang-3.8")
if (NOT ${CMAKE_C_COMPILER} MATCHES ".*clang")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 7fb8fe9.

@pgoodman pgoodman merged commit f21db76 into lifting-bits:master Jul 18, 2018
@ianklatzco ianklatzco mentioned this pull request Aug 16, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants