Small corrections, let's prepare it for the case microsoft restrict less probing

Author: AnastaZIuk

CMakeLists.txt

@@ -15,8 +15,8 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/toolchains/android/build.cmake)
 
 project(Nabla LANGUAGES CXX C)
 
-option(NBL_STATIC_BUILD "" OFF) # ON for static builds, OFF for shared
-option(NBL_DYNAMIC_MSVC_RUNTIME "" ON)
+option(NBL_STATIC_BUILD "" ON) # ON for static builds, OFF for shared
+option(NBL_DYNAMIC_MSVC_RUNTIME "" OFF)
 
 if(NBL_STATIC_BUILD)
 	message(STATUS "Static Nabla build enabled!")

cmake/common.cmake

@@ -49,7 +49,7 @@ macro(nbl_create_executable_project _EXTRA_SOURCES _EXTRA_OPTIONS _EXTRA_INCLUDE
 				VERBATIM
 			)
 
-			add_custom_target(${EXECUTABLE_NAME}_config ALL DEPENDS ${NBL_CONFIG_OUTPUT_FILE} ${NBL_ROOT_PATH}/cmake/scripts/nbl/applicationMSVCConfig.cmake)
+			add_custom_target(${EXECUTABLE_NAME}_with_config ALL DEPENDS ${NBL_CONFIG_OUTPUT_FILE} ${NBL_ROOT_PATH}/cmake/scripts/nbl/applicationMSVCConfig.cmake)
 		endif()
 
 		set(NBL_EXECUTABLE_SOURCES 
@@ -58,7 +58,6 @@ macro(nbl_create_executable_project _EXTRA_SOURCES _EXTRA_OPTIONS _EXTRA_INCLUDE
 		)
 
 		add_executable(${EXECUTABLE_NAME} ${NBL_EXECUTABLE_SOURCES})
-		add_dependencies(${EXECUTABLE_NAME} Nabla_manifest)
 
 		if(NBL_DYNAMIC_MSVC_RUNTIME)
 			set_property(TARGET ${EXECUTABLE_NAME} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
@@ -68,7 +67,13 @@ macro(nbl_create_executable_project _EXTRA_SOURCES _EXTRA_OPTIONS _EXTRA_INCLUDE
 	endif()
 
 	# 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)
+	if(NBL_STATIC_BUILD)
+		add_dependencies(${EXECUTABLE_NAME} Nabla)
+	else()
+		add_dependencies(${EXECUTABLE_NAME}_with_config Nabla_with_manifest)
+		#target_link_options(${EXECUTABLE_NAME} PRIVATE "/manifestdependency:\"type='win32' name='devshgraphicsprogramming.nabla' version='1.2.3.4' processorArchitecture='x86' language='*'\"")
+	endif()
+	
 	get_target_property(NBL_EGL_INCLUDE_DIRECORIES egl INCLUDE_DIRECTORIES)
 
 	target_include_directories(${EXECUTABLE_NAME}

cmake/scripts/nbl/applicationMSVCConfig.cmake

@@ -40,6 +40,7 @@ set(NBL_INPUT_MSVC_CONFIG_FILE ${NBL_ROOT_PATH}/cmake/config/msvc/application.ex
 
 file(RELATIVE_PATH NBL_DLL_RELATIVE_PATH "${NBL_GEN_DIRECTORY}" "${NBL_DLL_PATH}")
 cmake_path(GET NBL_DLL_RELATIVE_PATH PARENT_PATH NBL_ASSEMLBY_RELATIVE_PATH)
+cmake_path(GET NBL_ASSEMLBY_RELATIVE_PATH PARENT_PATH NBL_ASSEMLBY_RELATIVE_PATH)
 
 message(STATUS "Generating ${NBL_GEN_DIRECTORY}/${NBL_TARGET_NAME}.config")
 configure_file("${NBL_INPUT_MSVC_CONFIG_FILE}" "${NBL_GEN_DIRECTORY}/${NBL_TARGET_NAME}.config")

src/nbl/CMakeLists.txt

@@ -457,13 +457,14 @@ endif()
 
 if(NOT NBL_STATIC_BUILD)
 	set(NBL_ASSEMBLY_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/devshgraphicsprogramming.nabla" CACHE INTERNAL "" FORCE)
+	set(NBL_ASSEMBLIES_MANIFEST_FILEPATH "${NBL_ASSEMBLY_DIRECTORY}/devshgraphicsprogramming.nabla.manifest" CACHE INTERNAL "" FORCE)
 	add_custom_command(OUTPUT "${NBL_ASSEMBLIES_MANIFEST_FILEPATH}"
 		COMMAND ${CMAKE_COMMAND} -DNBL_ROOT_PATH:PATH=${NBL_ROOT_PATH} -DNBL_GEN_DIRECTORY:PATH=${NBL_ASSEMBLY_DIRECTORY} -DNABLA_DLL_PATH:FILEPATH=$<TARGET_FILE:Nabla> -P ${NBL_ROOT_PATH}/cmake/scripts/nbl/nablaMSVCManifest.cmake
 		COMMENT "Launching nabla.manifest generation script!"
 		VERBATIM
 	)
-	
-	add_custom_target(Nabla_manifest ALL DEPENDS ${NBL_ASSEMBLIES_MANIFEST_FILEPATH} ${NBL_ROOT_PATH}/cmake/scripts/nbl/nablaMSVCManifest.cmake)
+
+	add_custom_target(Nabla_with_manifest ALL DEPENDS ${NBL_ASSEMBLIES_MANIFEST_FILEPATH})
 	set_target_properties(Nabla PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${NBL_ASSEMBLY_DIRECTORY})
 endif()