Now we can build on Yosemite #1110
Conversation
made sampledata deps on cdat fixed deps for uuid
using -j1 all is smooth
| -DZLIB_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX} | ||
| ) | ||
| endif() | ||
| #if(NOT CDAT_USE_SYSTEM_ZLIB) |
There was a problem hiding this comment.
Aashish will comment more, but is there a compelling reason to make these changes in master?
There was a problem hiding this comment.
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)
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
ok i fixed that already. And libcdms was simply moved out to its own repo, easier to maintain
|
@aashish24 , I did the VTK_USE_SYSTEM_[lib] as you recommended |
|
@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. |
|
@aashish24 wait a bit just found a possible issue. Don't merge yet |
|
@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} ) | |||
There was a problem hiding this comment.
why depending on png? and jpeg?
There was a problem hiding this comment.
jasper needs jpeg
g2clib needs png
|
awesome! thanks! |
@aashish24 @dlonie @jbeezley @chaosphere2112 please test and review