Skip to content

Add cmake to ZoneMinder#178

Merged
chriswiggins merged 4 commits intomasterfrom
cmake
Sep 28, 2013
Merged

Add cmake to ZoneMinder#178
chriswiggins merged 4 commits intomasterfrom
cmake

Conversation

@mastertheknife
Copy link
Contributor

After a while working on this, i believe its ready.
One of my objectives for this was not to modify ZoneMinder in anyway, in order not to break anything. So as you can see, excluding the .travis.yml file, 16 new files are added, but 0 are modified and 0 are deleted.

Please all take a look at the INSTALL, to learn about building ZoneMinder with cmake.

@chriswiggins
Copy link
Contributor

I agree with merging this, but can you add @kylejohnson's thing to add the test zone and then the starting of ZM? I know this isn't working yet but we shouldn't have a merge overwrite the work of someone else :-)

@mastertheknife
Copy link
Contributor Author

Yeah good point, i'll do that.

@mastertheknife
Copy link
Contributor Author

Okay, fixing the travis stuff is difficult. I think it should be dealed with later on.

@chriswiggins
Copy link
Contributor

I agree. Will merge now

chriswiggins added a commit that referenced this pull request Sep 28, 2013
@chriswiggins chriswiggins merged commit ff4b2c0 into master Sep 28, 2013
@mastertheknife mastertheknife deleted the cmake branch September 30, 2013 10:58
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.

2 participants