From e5c9548594f9466012990639a56d7838cd84d3a0 Mon Sep 17 00:00:00 2001 From: Jefferson Amstutz Date: Fri, 19 May 2023 12:59:42 -0500 Subject: [PATCH] fix compile issues on Windows --- cts/CMakeLists.txt | 2 +- libs/anari/CMakeLists.txt | 6 +++++- libs/anari_test_scenes/scenes/scene.h | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cts/CMakeLists.txt b/cts/CMakeLists.txt index f53722a8..4ff45178 100644 --- a/cts/CMakeLists.txt +++ b/cts/CMakeLists.txt @@ -34,7 +34,7 @@ PUBLIC ${CMAKE_CURRENT_LIST_DIR}/header ) -target_link_libraries(${PROJECT_NAME} PUBLIC anari helium anari_test_scenes) +target_link_libraries(${PROJECT_NAME} PUBLIC glm::glm helium anari_test_scenes) find_package(Python3 REQUIRED COMPONENTS Interpreter) diff --git a/libs/anari/CMakeLists.txt b/libs/anari/CMakeLists.txt index 4ed04ad2..6154da52 100644 --- a/libs/anari/CMakeLists.txt +++ b/libs/anari/CMakeLists.txt @@ -15,7 +15,11 @@ project_add_library( ) if (NOT BUILD_SHARED_LIBS) - target_compile_definitions(${PROJECT_NAME} PUBLIC -DANARI_STATIC_DEFINE) + project_compile_definitions(PUBLIC -DANARI_STATIC_DEFINE) +endif() + +if (WIN32) + project_compile_definitions(PUBLIC -D_USE_MATH_DEFINES) endif() project_include_directories( diff --git a/libs/anari_test_scenes/scenes/scene.h b/libs/anari_test_scenes/scenes/scene.h index d7d09cd2..f4c84558 100644 --- a/libs/anari_test_scenes/scenes/scene.h +++ b/libs/anari_test_scenes/scenes/scene.h @@ -14,7 +14,8 @@ namespace scenes { using box3 = std::array; // bounds_lower, bounds_upper; -struct TestScene : public helium::ParameterizedObject +struct ANARI_TEST_SCENES_INTERFACE TestScene + : public helium::ParameterizedObject { virtual anari::World world() = 0; virtual box3 bounds();