Skip to content

Now we can build on Yosemite #1110

Merged
aashish24 merged 27 commits intomasterfrom
Yosemite
Mar 5, 2015
Merged

Now we can build on Yosemite #1110
aashish24 merged 27 commits intomasterfrom
Yosemite

Conversation

@doutriaux1
Copy link
Copy Markdown
Contributor

@aashish24 @dlonie @jbeezley @chaosphere2112 please test and review

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Aashish will comment more, but is there a compelling reason to make these changes in master?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

yes I turned off zlib and libxml2 libxslt etc.. there are on every system. I guess we can uncomment if you want but I'm not positive about what happen to CDAT_USE_SYSTEM_ZLIB now that we don't have include(libz_pkg)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I have to review bit more but basically if we use system PNG, JPEG etc, then we have to pass the appropriate flags to VTK or else VTK will build its on vtkjpeg, and vtkpng as well. So thing will build but won't run.

Also, I don't know why we took out cdms?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

ok i fixed that already. And libcdms was simply moved out to its own repo, easier to maintain

@doutriaux1
Copy link
Copy Markdown
Contributor Author

@aashish24 , I did the VTK_USE_SYSTEM_[lib] as you recommended

@doutriaux1
Copy link
Copy Markdown
Contributor Author

@aashish24 if you're uncomfortable with all this just put it back as before, don't comment out the files in CMakeLists.txt and uncomment the lines in VTK. I'm ok with it as well, just test again on your mac if you do so please.

@doutriaux1
Copy link
Copy Markdown
Contributor Author

@aashish24 wait a bit just found a possible issue. Don't merge yet

@doutriaux1
Copy link
Copy Markdown
Contributor Author

@aashish24 ok good to go. Pass even with CDAT_BUILD_MODE=ALL on RH6

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

why depending on png? and jpeg?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

jasper needs jpeg
g2clib needs png

aashish24 added a commit that referenced this pull request Mar 5, 2015
Now we can build on Yosemite
@aashish24 aashish24 merged commit 1219144 into master Mar 5, 2015
@aashish24 aashish24 deleted the Yosemite branch March 5, 2015 20:08
@doutriaux1
Copy link
Copy Markdown
Contributor Author

awesome! thanks!

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.

4 participants