Skip to content

Commit 72afba0

Browse files
committed
add Nabla_ROOT package var, Nabla target alias to use with exported generator expressions and make smoke build
1 parent 729d31c commit 72afba0

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

cmake/NablaConfig.cmake.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
@PACKAGE_INIT@
2+
3+
set(Nabla_ROOT "${PACKAGE_PREFIX_DIR}")
4+
25
include("${CMAKE_CURRENT_LIST_DIR}/NablaExportTargets.cmake")
36
check_required_components(Nabla)

smoke/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ find_package(Nabla REQUIRED CONFIG
2525
PATHS ${PACKAGE_CONFIG_SEARCH_PATHS}
2626
)
2727

28+
message(STATUS
29+
"\n-- Nabla_ROOT = ${Nabla_ROOT}"
30+
"\n-- Nabla_VERSION = ${Nabla_VERSION}"
31+
)
32+
2833
add_executable(smoke main.cpp pch.hpp cdb.ps1)
2934
target_link_libraries(smoke PRIVATE Nabla::Nabla)
3035
target_precompile_headers(smoke PRIVATE pch.hpp)
@@ -35,7 +40,7 @@ enable_testing()
3540
set(OPTS
3641
NBL_EXPLICIT_MODULE_LOAD_LOG=1
3742
NBL_EXPLICIT_MODULE_REQUEST_LOG=1
38-
NBL_INSTALL_DIRECTORY=${NBL_INSTALL_PREFIX}
43+
NBL_INSTALL_DIRECTORY=${Nabla_ROOT}
3944
)
4045

4146
option(ENABLE_CRASH_HANDLER "Enable crash handler" ON)

src/nbl/CMakeLists.txt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,7 @@ else()
356356
${NBL_LIBRARY_CREATION_SOURCES}
357357
)
358358
endif()
359+
add_library(Nabla::Nabla ALIAS Nabla)
359360

360361
# from old build config template:
361362
#
@@ -376,6 +377,12 @@ set(PUBLIC_DEFINITIONS
376377
$<$<PLATFORM_ID:Linux>:_NBL_PLATFORM_LINUX_>
377378
$<$<PLATFORM_ID:Darwin>:_NBL_PLATFORM_OSX_>
378379
$<$<PLATFORM_ID:Android>:_NBL_PLATFORM_ANDROID_>
380+
381+
# extras
382+
BOOST_ALL_NO_LIB
383+
NOMINMAX
384+
_CRT_SECURE_NO_DEPRECATE
385+
_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
379386
)
380387

381388
if(NOT NBL_STATIC_BUILD)
@@ -416,7 +423,7 @@ target_compile_definitions(Nabla
416423
PRIVATE __NBL_BUILDING_NABLA__
417424
)
418425

419-
target_link_options(Nabla INTERFACE $<$<CXX_COMPILER_FRONTEND_VARIANT:MSVC>:/DELAYLOAD:$<TARGET_FILE_NAME:Nabla>>)
426+
target_link_options(Nabla INTERFACE $<$<CXX_COMPILER_FRONTEND_VARIANT:MSVC>:/DELAYLOAD:$<TARGET_FILE_NAME:Nabla::Nabla>>)
420427
if(CMAKE_CXX_COMPILER_FRONTEND_VARIANT MATCHES MSVC)
421428
target_link_options(Nabla
422429
PRIVATE /DELAYLOAD:dxcompiler.dll
@@ -444,7 +451,7 @@ if(NOT NBL_STATIC_BUILD)
444451
)
445452

446453
target_compile_definitions(Nabla
447-
INTERFACE _NABLA_DLL_NAME_="$<PATH:REMOVE_EXTENSION,$<TARGET_FILE_NAME:Nabla>>"
454+
INTERFACE _NABLA_DLL_NAME_="$<PATH:REMOVE_EXTENSION,$<TARGET_FILE_NAME:Nabla::Nabla>>"
448455
)
449456
endif()
450457

0 commit comments

Comments
 (0)