fix windows compilation, better cmake output

gcontini

2019-12-14 79f2b46f721b69bc182f35324f8fc195a5cf3f54

 src/library/locate/EnvironmentVarData.cpp

@@ -6,6 +6,7 @@
 */

#include "EnvironmentVarData.hpp"
#include <licensecc/datatypes.h>

#include <licensecc_properties.h>
#include <cstdlib>
@@ -13,7 +14,6 @@
#include <string>
#include <vector>

#include "../api/datatypes.h"
#include "../base/base64.h"
#include "../base/EventRegistry.h"
#include "../base/StringUtils.h"
@@ -23,15 +23,11 @@

using namespace std;

EnvironmentVarData::EnvironmentVarData() :
      LocatorStrategy("EnvironmentVarData") {
}
EnvironmentVarData::EnvironmentVarData() : LocatorStrategy("EnvironmentVarData") {}

EnvironmentVarData::~EnvironmentVarData() {
}
EnvironmentVarData::~EnvironmentVarData() {}

const vector<string> EnvironmentVarData::license_locations(
      EventRegistry &eventRegistry) {
const vector<string> EnvironmentVarData::license_locations(EventRegistry &eventRegistry) {
   vector<string> diskFiles;
   char *env_var_value = getenv(LICENSE_DATA_ENV_VAR);
   if (env_var_value != nullptr && env_var_value[0] != '\0') {
@@ -44,24 +40,22 @@
         isBase64 = (licenseFormat == BASE64);
      }
   } else {
      eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED,
      LICENSE_LOCATION_ENV_VAR);
      eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED, LICENSE_LOCATION_ENV_VAR);
   }
   return diskFiles;
}

const std::string EnvironmentVarData::retrieve_license_content(
      const std::string &licenseLocation) const {
const std::string EnvironmentVarData::retrieve_license_content(const std::string &licenseLocation) const {
   string tmpVal = getenv(LICENSE_LOCATION_ENV_VAR);
   if (isBase64) {
      int flen = 0;
      unsigned char *raw = unbase64(tmpVal.c_str(), tmpVal.length(), &flen);
      string str = string(reinterpret_cast<char*>(raw));
      string str = string(reinterpret_cast<char *>(raw));
      free(raw);
      return str;
   }
   return tmpVal;
}

}
}
}  // namespace locate
}  // namespace license