vf cmake

Author: firewave

Makefile

@@ -630,13 +630,13 @@ $(libcppdir)/valueflow.o: lib/valueflow.cpp lib/analyzer.h lib/astutils.h lib/ca
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/valueflow.cpp
 
 $(libcppdir)/vf/common.o: lib/vf/common.cpp lib/vf/common.h
-	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf/common.cpp
+	$(CXX) ${INCLUDE_FOR_LIB} -Ilib/vf $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf/common.cpp
 
 $(libcppdir)/vf/enumvalue.o: lib/vf/enumvalue.cpp lib/vf/enumvalue.h
-	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf/enumvalue.cpp
+	$(CXX) ${INCLUDE_FOR_LIB} -Ilib/vf $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf/enumvalue.cpp
 
 $(libcppdir)/vf/number.o: lib/vf/number.cpp lib/vf/common.h lib/vf/number.h
-	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf/number.cpp
+	$(CXX) ${INCLUDE_FOR_LIB} -Ilib/vf $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf/number.cpp
 
 $(libcppdir)/vfvalue.o: lib/vfvalue.cpp lib/config.h lib/errortypes.h lib/mathlib.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vfvalue.cpp

tools/dmake.cpp

@@ -30,6 +30,15 @@
 #include "../lib/pathmatch.h"
 #include "../lib/utils.h"
 
+static std::string incdir(std::string filename)
+{
+    // TODO: make this generic
+    if (filename.compare(0,7,"lib/vf/") == 0) {
+        return " -Ilib/vf";
+    }
+    return "";
+}
+
 static std::string builddir(std::string filename)
 {
     if (filename.compare(0,4,"lib/") == 0)
@@ -127,7 +136,7 @@ static void compilefiles(std::ostream &fout, const std::vector<std::string> &fil
         std::sort(depfiles.begin(), depfiles.end());
         for (const std::string &depfile : depfiles)
             fout << " " << depfile;
-        fout << "\n\t$(CXX) " << args << " $(CPPFLAGS) $(CXXFLAGS)" << (external?" -w":"") << " -c -o $@ " << builddir(file) << "\n\n";
+        fout << "\n\t$(CXX) " << args << incdir(file) << " $(CPPFLAGS) $(CXXFLAGS)" << (external?" -w":"") << " -c -o $@ " << builddir(file) << "\n\n";
     }
 }