diff --git a/ResourceFiles/ResourceFile.cc b/ResourceFiles/ResourceFile.cc index dc7ca520a0..ab4e243c99 100644 --- a/ResourceFiles/ResourceFile.cc +++ b/ResourceFiles/ResourceFile.cc @@ -165,7 +165,7 @@ bool ResourceFile::assign(std::string pathstring, ResourceFile::Format f) format = Format::basilisk; #endif } - std::cout << "assigned: " << pathstring << " format " << (int)format << "\n"; +// std::cout << "assigned: " << pathstring << " format " << (int)format << "\n"; return true; } diff --git a/Rez/CMakeLists.txt b/Rez/CMakeLists.txt index 9e2a7a73c7..c87d2f83f5 100644 --- a/Rez/CMakeLists.txt +++ b/Rez/CMakeLists.txt @@ -21,6 +21,10 @@ set(CMAKE_CXX_FLAGS "--std=c++11 -Wall") find_package(Boost COMPONENTS wave filesystem system thread regex program_options) +# Look for bison. + # We need Version 3, and Mac OS X still comes with an outdated version (2.3). + # So we just add the path where the homebrew package manager installs its + # "keg-only" version. Shouldn't hurt on Linux. set(CMAKE_PROGRAM_PATH $CMAKE_PROGRAM_PATH "/usr/local/opt/bison/bin") find_package(BISON 3.0.2)