Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Now we can build on Yosemite #1110

Merged
merged 27 commits into from Mar 5, 2015
Merged

Now we can build on Yosemite #1110

merged 27 commits into from Mar 5, 2015

Conversation

@doutriaux1
Copy link
Contributor

@doutriaux1 doutriaux1 commented Mar 4, 2015

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

-DZLIB_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
)
endif()
#if(NOT CDAT_USE_SYSTEM_ZLIB)
Copy link
Contributor

@allisonvacanti allisonvacanti Mar 4, 2015

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

Copy link
Contributor Author

@doutriaux1 doutriaux1 Mar 4, 2015

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
Contributor

@aashish24 aashish24 Mar 4, 2015

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
Contributor Author

@doutriaux1 doutriaux1 Mar 5, 2015

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

@doutriaux1
Copy link
Contributor Author

@doutriaux1 doutriaux1 commented Mar 5, 2015

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

@doutriaux1
Copy link
Contributor Author

@doutriaux1 doutriaux1 commented Mar 5, 2015

@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
Contributor Author

@doutriaux1 doutriaux1 commented Mar 5, 2015

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

@doutriaux1
Copy link
Contributor Author

@doutriaux1 doutriaux1 commented Mar 5, 2015

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

@@ -0,0 +1,3 @@
set(libcdms_deps ${netcdf_pkg}
${jasper_pkg} ${g2clib_pkg} ${tiff_pkg}
${png_pkg} ${jpeg_pkg} )
Copy link
Contributor

@aashish24 aashish24 Mar 5, 2015

why depending on png? and jpeg?

Copy link
Contributor Author

@doutriaux1 doutriaux1 Mar 5, 2015

jasper needs jpeg
g2clib needs png

aashish24 added a commit that referenced this issue Mar 5, 2015
Now we can build on Yosemite
@aashish24 aashish24 merged commit 1219144 into master Mar 5, 2015
0 of 2 checks passed
@aashish24 aashish24 deleted the Yosemite branch Mar 5, 2015
@doutriaux1
Copy link
Contributor Author

@doutriaux1 doutriaux1 commented Mar 5, 2015

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
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants