Fix build (tested locally on ubuntu and in githubaction container) (2…

…2.10 22:54)
mlomb · Oct 22, 2020 · 24bf736 · 24bf736
1 parent 57c2d5a
commit 24bf736
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/.github/workflows/example.yml b/.github/workflows/example.yml
@@ -21,7 +21,7 @@ jobs:
         mkdir ${{runner.workspace}}/llvm
         tar -xf clang+llvm-11.0.0-x86_64-linux-gnu-ubuntu-20.04.tar.xz -C ${{runner.workspace}}/llvm
         echo "${{runner.workspace}}/llvm/clang+llvm-11.0.0-x86_64-linux-gnu-ubuntu-20.04/bin" >> $GITHUB_PATH
-
+    
     - uses: actions/checkout@v2
       with:
         submodules: 'true'
@@ -41,4 +41,4 @@ jobs:
     - name: Run Example
       working-directory: ${{runner.workspace}}/build
       shell: bash
-      run: ./${{runner.workspace}}/build/Example
+      run: ./Example
diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt
@@ -11,4 +11,26 @@ target_link_libraries(Example MetaCPP)
 
 # MetaCPP automatic reflection
 include(../CMake/MetaPrebuild.cmake)
-meta_generate(Example "objects.hpp" "Generated.hpp" "Generated.cpp" "")
+
+if(NOT DEFINED META_GENERATE_FLAGS)
+    set(META_GENERATE_FLAGS "")
+endif()
+if(DEFINED CLANG_INCLUDE_DIR)
+    set(META_GENERATE_FLAGS "${META_GENERATE_FLAGS} --flag -I${CLANG_INCLUDE_DIR}")
+else()
+    # Fire all weapons
+    set(CLANG_INCLUDE_CANDIDATES "/usr/local/lib/clang/12.0.0/include")
+    set(CLANG_INCLUDE_CANDIDATES "${CLANG_INCLUDE_CANDIDATES};/usr/lib/llvm-12/lib/clang/12.0.0/include")
+    set(CLANG_INCLUDE_CANDIDATES "${CLANG_INCLUDE_CANDIDATES};/usr/local/lib/clang/11.0.0/include")
+    set(CLANG_INCLUDE_CANDIDATES "${CLANG_INCLUDE_CANDIDATES};/usr/lib/llvm-11/lib/clang/11.0.0/include")
+    set(CLANG_INCLUDE_CANDIDATES "${CLANG_INCLUDE_CANDIDATES};/usr/local/lib/clang/10.0.0/include")
+    set(CLANG_INCLUDE_CANDIDATES "${CLANG_INCLUDE_CANDIDATES};/usr/lib/llvm-10/lib/clang/10.0.0/include")
+    foreach(CLANG_INCLUDE_CANDIDATE ${CLANG_INCLUDE_CANDIDATES})
+        if(EXISTS ${CLANG_INCLUDE_CANDIDATE})
+            set(META_GENERATE_FLAGS "${META_GENERATE_FLAGS} --flag -I${CLANG_INCLUDE_CANDIDATE}")
+            break()
+        endif()
+    endforeach()
+endif()
+
+meta_generate(Example "objects.hpp" "Generated.hpp" "Generated.cpp" "${META_GENERATE_FLAGS}")
diff --git a/MetaCPP-CLI/CMakeLists.txt b/MetaCPP-CLI/CMakeLists.txt
@@ -10,7 +10,7 @@ find_Package(Clang REQUIRED)
 
 # LLVM
 link_directories(${LLVM_LIB_DIR})
-# add_definitions(${LLVM_COMPILE_FLAGS})
+#add_definitions(${LLVM_COMPILE_FLAGS})
 add_definitions(-fno-rtti) # this should match the LLVM rtti flag
 
 set(MetaCPPCLI_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/MetaCPP/src/MetaCPP/Type.cpp b/MetaCPP/src/MetaCPP/Type.cpp
@@ -183,7 +183,7 @@ namespace metacpp {
 
 	bool Type::HasSize() const {
 		const std::string& name = m_QualifiedName.GetName();
-		return name != "void" && name != "_Alloc_hider";
+		return name != "void" && name != "_Alloc_hider" && m_Access == AccessSpecifier::PUBLIC;
 	}
 
 	const std::vector<Method>& Type::GetMethods() const {