Early apply env settings. Add cppan_genpb.

egorpugin · egorpugin · commit d2fb42f0787e · 2018-07-13T03:43:04.000+03:00
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
@@ -374,13 +374,26 @@ String Settings::get_hash() const
     h |= configuration;
     h |= default_configuration;
 
+    for (auto &o : env)
+    {
+        //h |= o.first;
+        //h |= o.second;
+        // do we really need this here?
+#ifdef _WIN32
+        _putenv_s(o.first.c_str(), o.second.c_str());
+#else
+        setenv(o.first.c_str(), o.second.c_str(), 1);
+#endif
+    }
+
     // besides we track all valuable ENV vars
     // to be sure that we'll load correct config
     auto add_env = [&h](const char *var)
     {
         auto e = getenv(var);
         if (!e)
             return;
+        h |= String(var);
         h |= String(e);
     };
 
diff --git a/src/inserts/functions.cmake b/src/inserts/functions.cmake
@@ -1140,6 +1140,25 @@ function(cppan_qt5_wrap_cpp outfiles)
     endif()
 endfunction()
 
+########################################
+# MACRO cppan_genpb
+########################################
+
+macro(cppan_genpb f)
+    get_filename_component(n ${f} NAME_WE)
+    get_filename_component(d ${f} DIRECTORY)
+    string(REPLACE "${SDIR}" "" d2 "${d}")
+    set(n ${d2}/${n})
+    add_custom_command(
+        OUTPUT
+            ${BDIR}/${n}.pb.cc
+            ${BDIR}/${n}.pb.h
+        COMMAND
+            pvt.cppan.demo.google.protobuf.protoc ${f} --cpp_out=${BDIR}/${d2} -I ${d}
+    )
+    set(src ${src} ${BDIR}/${n}.pb.cc ${BDIR}/${n}.pb.h)
+endmacro()
+
 ########################################
 # MACRO cppan_ragel
 ########################################
