Update Ghoul version

Make the modules depend on C++14
Change the OpenSpace code to the new Ghoul version
This commit is contained in:
Alexander Bock
2015-12-07 18:54:17 -05:00
parent ba35b834f7
commit 875de328aa
6 changed files with 11 additions and 2 deletions

View File

@@ -22,6 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <ghoul/logging/logmanager.h>
namespace openspace {
namespace properties {

View File

@@ -24,6 +24,9 @@
#include <modules/newhorizons/util/instrumentdecoder.h>
#include <ghoul/misc/assert.h>
#include <ghoul/logging/logmanager.h>
namespace {
const std::string _loggerCat = "InstrumentDecoder";
const std::string keyDetector = "DetectorType";

View File

@@ -28,6 +28,8 @@
#include <openspace/util/spicemanager.h>
#include <modules/newhorizons/util/decoder.h>
#include <ghoul/logging/logmanager.h>
namespace {
const std::string _loggerCat = "SequenceParser";
const std::string keyTranslation = "DataInputTranslation";

View File

@@ -24,6 +24,8 @@
#include <openspace/properties/propertyowner.h>
#include <ghoul/logging/logmanager.h>
#include <algorithm>
#include <assert.h>

View File

@@ -76,7 +76,7 @@ endmacro ()
# Set the compiler settings that are common to all modules
function (set_common_compile_settings target_name)
set_property(TARGET ${library_name} PROPERTY CXX_STANDARD 11)
set_property(TARGET ${library_name} PROPERTY CXX_STANDARD 14)
set_property(TARGET ${library_name} PROPERTY CXX_STANDARD_REQUIRED On)
if (MSVC)