Merge branch 'dev'

Author: jsoysouvanh

.github/workflows/deploy_release.yml

@@ -98,13 +98,18 @@ jobs:
       - name: Run Tests
         run: |
           cd Build/Release && ctest -C Release -V
+
+      - name: Install patchelf
+        run: sudo apt-get install patchelf
+
+      - name: Patch ELF RUNPATH
+        run: patchelf --set-rpath "\$ORIGIN" Build/Release/Bin/RefurekuGenerator
 
       - name: Setup Binaries Artifact
         run: |
           mkdir RefurekuBinaries
           mkdir RefurekuBinaries/Linux/
           mkdir RefurekuBinaries/Linux/Bin
-          mv Refureku/Generator/ThirdParty/Kodgen/Kodgen/ThirdParty/x64/Shared/libclang.so RefurekuBinaries/Linux/Bin/libclang.so
           mv Refureku/Generator/ThirdParty/Kodgen/Kodgen/ThirdParty/x64/Shared/libclang.so.12 RefurekuBinaries/Linux/Bin/libclang.so.12
           mv Build/Release/Bin/RefurekuGenerator RefurekuBinaries/Linux/Bin/
           mv Build/Release/Bin/libRefureku.so RefurekuBinaries/Linux/Bin/
@@ -153,6 +158,12 @@ jobs:
       - name: Run Tests
         run: cd Build/Release && ctest -C Release -V
 
+        # The 2nd command (install_name_tool -change) is probably wrong since the first argument (libclang.dylib) is not a valid path in the exe
+      - name: Patch RPATH
+        run: |
+          install_name_tool -add_rpath @executable_path Build/Release/Bin/RefurekuGenerator
+          install_name_tool -change libclang.dylib @rpath/libclang.dylib Build/Release/Bin/RefurekuGenerator
+
       - name: Setup Binaries Artifact
         run: |
           mkdir RefurekuBinaries

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13.5)
+cmake_minimum_required(VERSION 3.14.0)
 
 project(Refureku)
 

Refureku/Generator/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13.5)
+cmake_minimum_required(VERSION 3.14.0)
 
 project(RefurekuGenerator)
 
@@ -8,9 +8,9 @@ add_subdirectory(ThirdParty/Kodgen)
 set(RefurekuGeneratorExeTarget RefurekuGenerator)
 add_executable(${RefurekuGeneratorExeTarget} Source/main.cpp)
 
-target_include_directories(${RefurekuGeneratorExeTarget} PUBLIC Include)
+target_include_directories(${RefurekuGeneratorExeTarget} PRIVATE Include)
 
-target_link_libraries(${RefurekuGeneratorExeTarget} PUBLIC Kodgen)
+target_link_libraries(${RefurekuGeneratorExeTarget} PRIVATE Kodgen)
 
 if (RFK_DEV)
 
@@ -33,7 +33,7 @@ if (MSVC)
 else ()	# Clang or GCC
 
 	target_compile_options(${RefurekuGeneratorExeTarget} PRIVATE -Wall -Wextra -Wpedantic)
-
+	
 endif()
 
 

Refureku/Library/Include/Public/Refureku/Config.h

@@ -11,6 +11,7 @@
 #define REFUREKU_VERSION_MAJOR 2
 #define REFUREKU_VERSION_MINOR 0
 #define REFUREKU_VERSION_PATCH 1
+#define REFUREKU_VERSION (REFUREKU_VERSION_MAJOR * 10000 + REFUREKU_VERSION_MINOR * 100 + REFUREKU_VERSION_PATCH)
 
 //Features
 #if !defined(_MSC_VER) || defined(__clang__)