Fixed extension cmake issues.

Author: MohammadFakhreddin

examples_tests/61.UI/CMakeLists.txt

@@ -1,16 +1,21 @@
 if(NBL_BUILD_IMGUI)
 
-include(common RESULT_VARIABLE RES)
-if(NOT RES)
-	message(FATAL_ERROR "common.cmake not found. Should be in {repo_root}/cmake directory")
-endif()
+	include(common RESULT_VARIABLE RES)
+	if(NOT RES)
+		message(FATAL_ERROR "common.cmake not found. Should be in {repo_root}/cmake directory")
+	endif()
 
-list(APPEND libs 
-	"imgui"
-	"${NBL_EXT_IMGUI_LIB}"
-)
+	list(APPEND libs 
+		"imgui"
+		"${NBL_EXT_IMGUI_UI_LIB}"
+	)
 
-# I'll ask about why it is not working about me adding imGui.cpp manually
-nbl_create_executable_project("../../src/nbl/ext/ImGui/ImGui.cpp" "" "" "${libs}")
+	# I'll ask about why it is not working about me adding imGui.cpp manually.
+	nbl_create_executable_project(
+		""
+		"" 
+		"${NBL_EXT_IMGUI_UI_INCLUDE_DIRS}" 
+		"${libs}"
+	)
 
 endif()

examples_tests/CMakeLists.txt

@@ -73,4 +73,6 @@ if (NOT NBL_BUILD_ANDROID)
 endif()
 add_subdirectory(60.ClusteredRendering EXCLUDE_FROM_ALL)
 add_subdirectory(0.ImportanceSamplingEnvMaps EXCLUDE_FROM_ALL) #TODO: integrate back into 42
-add_subdirectory(61.UI EXCLUDE_FROM_ALL)
+if (NBL_BUILD_IMGUI)
+	add_subdirectory(61.UI EXCLUDE_FROM_ALL)
+endif()

src/nbl/ext/CMakeLists.txt

@@ -55,12 +55,12 @@ endif()
 
 if (NBL_BUILD_IMGUI)
     add_subdirectory(ImGui)
-    set(NBL_EXT_IMGUI_INCLUDE_DIRS
-        ${NBL_EXT_IMGUI_INCLUDE_DIRS}
+    set(NBL_EXT_IMGUI_UI_INCLUDE_DIRS
+        ${NBL_EXT_IMGUI_UI_INCLUDE_DIRS}
         PARENT_SCOPE
     )
-    set(NBL_EXT_IMGUI_LIB
-        ${NBL_EXT_IMGUI_LIB}
+    set(NBL_EXT_IMGUI_UI_LIB
+        ${NBL_EXT_IMGUI_UI_LIB}
         PARENT_SCOPE
     )
 endif()

src/nbl/ext/ImGui/CMakeLists.txt

@@ -16,10 +16,10 @@ set(NBL_EXT_IMGUI_EXTERNAL_INCLUDE
 )
 
 nbl_create_ext_library_project(
-	ImGui
+	IMGUI_UI
 	"${NBL_EXT_IMGUI_H}"
 	"${NBL_EXT_IMGUI_SRC}"
 	"${NBL_EXT_IMGUI_EXTERNAL_INCLUDE}"
 	""
     ""
-)
+)