wipe define.h, correct headers install rules, make export install interface relocatable with generator expressions

Author: AnastaZIuk

CMakeLists.txt

@@ -37,7 +37,6 @@ enable_language(C CXX ASM ASM_NASM)
 
 if(MSVC)
 	enable_language(ASM_MASM)
-	link_libraries(delayimp)
 endif()
 
 # TODO: TO BE KILLED, keep both in one tree
@@ -168,12 +167,6 @@ endif()
 include(adjust/flags)
 include(adjust/definitions)
 
-if(NBL_STATIC_BUILD)
-	unset(_NBL_SHARED_BUILD_ CACHE)
-else()
-	set(_NBL_SHARED_BUILD_ ON CACHE INTERNAL "")
-endif()
-
 option(NBL_BUILD_DPL "Enable DPL (Dynamic Parallelism Library)" OFF)
 option(NBL_PCH "Enable pre-compiled header" ON)
 option(NBL_FAST_MATH "Enable fast low-precision math" OFF) # the reason OFF is by default now is the var controling it at build time was set AFTER BuildConfigOptions was generated - resulting in the feature being always OFF regardless the value xD - so just for sanity, keeping the same behaviour by default
@@ -301,18 +294,18 @@ write_basic_package_version_file(
 configure_package_config_file(
     "${CMAKE_CURRENT_LIST_DIR}/cmake/NablaConfig.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/NablaConfig.cmake"
-    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Nabla
+    INSTALL_DESTINATION cmake
 )
 
 install(EXPORT NablaExportTargets
     NAMESPACE Nabla::
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Nabla
+    DESTINATION cmake
 )
 
 install(FILES
     "${CMAKE_CURRENT_BINARY_DIR}/NablaConfig.cmake"
     "${CMAKE_CURRENT_BINARY_DIR}/NablaConfigVersion.cmake"
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Nabla
+    DESTINATION cmake
 )
 
 NBL_ADJUST_FOLDERS(nabla)

cmake/FindNabla.cmake

@@ -87,5 +87,4 @@ set(CPACK_COMPONENT_HEADERS_DEPENDS Libraries Runtimes)
 
 set(CPACK_THREADS 0) # try to use all threads for compression
 
-include(CPack)
-include("${CMAKE_CURRENT_LIST_DIR}/find/nabla.cmake")
+include(CPack)

cmake/cpack/find/compoment/template.cmake

@@ -13,7 +13,7 @@
 #cmakedefine _NBL_COMPILE_WITH_GLI_
 #cmakedefine _NBL_COMPILE_WITH_OPEN_EXR_
 
-// graphics API backend
+// graphics API backend // TODO: never used?
 #cmakedefine _NBL_COMPILE_WITH_VULKAN_
 
 // loaders
@@ -54,7 +54,7 @@
 #cmakedefine _NBL_BUILD_OPTIX_
 
 // extra config
-#cmakedefine __NBL_FAST_MATH
+#cmakedefine __NBL_FAST_MATH // TODO: it should not really be there, its usage requirement
 #cmakedefine NBL_EMBED_BUILTIN_RESOURCES
 
 #cmakedefine _NBL_BUILD_DPL_
@@ -74,8 +74,7 @@
 #endif
 #endif
 
-// DLL exports
-#cmakedefine _NBL_SHARED_BUILD_
+// Nabla API definition for shared library usage, empty for static build
 #ifdef _NBL_SHARED_BUILD_
     #if defined(__NBL_BUILDING_NABLA__) // currently compiling nabla, this define is passed through the commandline
         #if defined(_MSC_VER)
@@ -94,15 +93,4 @@
     #define NBL_API2
 #endif
 
-// any other target definitions for using Nabla as framework in another project
-
-// TODO: not this way, use CMake usage requirements!
-/*
-
-#ifndef __NBL_BUILDING_NABLA__
-#include "define.h"
-#endif // __NBL_BUILDING_NABLA__
-
-*/
-
 #endif // __NBL_BUILD_CONFIG_OPTIONS_H_INCLUDED__

cmake/cpack/find/config/template.cmake

@@ -64,17 +64,24 @@ class IApplicationFramework : public core::IReferenceCounted
             } install, env, build, rel;
 
             #if defined(NBL_CPACK_PACKAGE_NABLA_DLL_DIR_ABS_KEY) && defined(NBL_CPACK_PACKAGE_DXC_DLL_DIR_ABS_KEY)
+
+            #if defined(_NABLA_INSTALL_DIR_)
             install.nabla = std::filesystem::absolute(system::path(_NABLA_INSTALL_DIR_) / NBL_CPACK_PACKAGE_NABLA_DLL_DIR_ABS_KEY);
             install.dxc = std::filesystem::absolute(system::path(_NABLA_INSTALL_DIR_) / NBL_CPACK_PACKAGE_DXC_DLL_DIR_ABS_KEY);
+            #endif
 
             env.nabla = sdk / NBL_CPACK_PACKAGE_NABLA_DLL_DIR_ABS_KEY;
             env.dxc = sdk / NBL_CPACK_PACKAGE_DXC_DLL_DIR_ABS_KEY;
             #endif
 
             #ifdef _NBL_SHARED_BUILD_
+            #if defined(_NABLA_OUTPUT_DIR_)
             build.nabla = _NABLA_OUTPUT_DIR_;
             #endif
+            #endif
+            #if defined(_DXC_DLL_)
             build.dxc = path(_DXC_DLL_).parent_path();
+            #endif
 
             #ifdef NBL_CPACK_PACKAGE_NABLA_DLL_DIR
             rel.nabla = NBL_CPACK_PACKAGE_NABLA_DLL_DIR;