Merge pull request #334 from Devsh-Graphics-Programming/BuildSystemFix

Build system fix

Author: devshgraphicsprogramming

cmake/common.cmake

@@ -47,12 +47,14 @@ macro(nbl_create_executable_project _EXTRA_SOURCES _EXTRA_OPTIONS _EXTRA_INCLUDE
 
 	# EXTRA_SOURCES is var containing non-common names of sources (if any such sources, then EXTRA_SOURCES must be set before including this cmake code)
 	add_dependencies(${EXECUTABLE_NAME} Nabla)
-
+	get_target_property(NBL_EGL_INCLUDE_DIRECORIES egl INCLUDE_DIRECTORIES)
+	
 	target_include_directories(${EXECUTABLE_NAME}
 		PUBLIC ../../include
 		PRIVATE ${_EXTRA_INCLUDES}
+		PRIVATE ${NBL_EGL_INCLUDE_DIRECORIES}
 	)
-	target_link_libraries(${EXECUTABLE_NAME} Nabla ${_EXTRA_LIBS}) # see, this is how you should code to resolve github issue 311
+	target_link_libraries(${EXECUTABLE_NAME} PUBLIC Nabla ${_EXTRA_LIBS}) # see, this is how you should code to resolve github issue 311
 
 	add_compile_options(${_EXTRA_OPTIONS})
 
@@ -181,6 +183,7 @@ macro(nbl_create_ext_library_project EXT_NAME LIB_HEADERS LIB_SOURCES LIB_INCLUD
 	add_dependencies(${LIB_NAME} Nabla)
 
 	get_target_property(_NBL_NABLA_TARGET_BINARY_DIR_ Nabla BINARY_DIR)
+	get_target_property(NBL_EGL_INCLUDE_DIRECORIES egl INCLUDE_DIRECTORIES)
 
 	target_include_directories(${LIB_NAME}
 		PUBLIC ${_NBL_NABLA_TARGET_BINARY_DIR_}/build/import
@@ -191,6 +194,7 @@ macro(nbl_create_ext_library_project EXT_NAME LIB_HEADERS LIB_SOURCES LIB_INCLUD
 		PUBLIC ${CMAKE_SOURCE_DIR}/src
 		PUBLIC ${CMAKE_SOURCE_DIR}/source/Nabla
 		PRIVATE ${LIB_INCLUDES}
+		PRIVATE ${NBL_EGL_INCLUDE_DIRECORIES}
 	)
 	add_dependencies(${LIB_NAME} Nabla)
 	target_link_libraries(${LIB_NAME} PUBLIC Nabla)

include/nbl/video/COpenGLSync.h

@@ -57,7 +57,7 @@ class COpenGLSync final : public core::IReferenceCounted
         // Already signalled constructor (for IGPUFence)
         struct signalled_t {};
         constexpr static inline signalled_t signalled = {};
-        inline COpenGLSync(core::smart_refctd_ptr<IOpenGL_LogicalDevice>&& _dev, IOpenGL_FunctionTable* _gl, signalled_t signalled);
+        COpenGLSync(core::smart_refctd_ptr<IOpenGL_LogicalDevice>&& _dev, IOpenGL_FunctionTable* _gl, signalled_t signalled);
 
     private:
         core::smart_refctd_ptr<IOpenGL_LogicalDevice> device;

src/nbl/CMakeLists.txt

@@ -582,6 +582,7 @@ target_include_directories(Nabla PUBLIC
 	"$<$<BOOL:${OpenGL_EGL_FOUND}>:${OPENGL_EGL_INCLUDE_DIRS}>"
 	"$<$<BOOL:${WAYLAND_CLIENT_FOUND}>:${WAYLAND_CLIENT_INCLUDE_DIR}>"
 )
+
 target_include_directories(Nabla PUBLIC ${NBL_ROOT_PATH}/src ${NBL_ROOT_PATH}/source/Nabla ${NBL_ROOT_PATH}/src/3rdparty) # this should be PRIVATE, but things from /src (or /source) are sometimes included in things in /include and so examples have to put source dirs into theirs Include Path
 target_include_directories(Nabla PRIVATE ${CMAKE_BINARY_DIR}/include)
 if (UNIX AND NOT ANDROID AND NOT APPLE)