Fix windows linking against shared dll for non-cmake projects (Academ…

…ySoftwareFoundation#1067) ...by ensuring that MATERIALX_BUILD_SHARED_LIBS is defined.
tomas-davidovic · Sep 3, 2022 · ce91328 · ce91328
1 parent a1f7f72
commit ce91328
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/source/MaterialXCore/CMakeLists.txt b/source/MaterialXCore/CMakeLists.txt
@@ -7,10 +7,6 @@ add_library(MaterialXCore ${materialx_source} ${materialx_headers})
 
 add_definitions(-DMATERIALX_CORE_EXPORTS)
 
-if (MATERIALX_BUILD_SHARED_LIBS)
-target_compile_definitions(MaterialXCore PUBLIC -DMATERIALX_BUILD_SHARED_LIBS)
-endif()
-
 set_target_properties(
     MaterialXCore PROPERTIES
     OUTPUT_NAME MaterialXCore${MATERIALX_LIBNAME_SUFFIX}

diff --git a/source/MaterialXCore/Generated.h.in b/source/MaterialXCore/Generated.h.in
@@ -10,6 +10,8 @@
 #define MATERIALX_MINOR_VERSION @MATERIALX_MINOR_VERSION@
 #define MATERIALX_BUILD_VERSION @MATERIALX_BUILD_VERSION@
 
+#cmakedefine MATERIALX_BUILD_SHARED_LIBS
+
 // Establish namespace:
 namespace @MATERIALX_NAMESPACE@
 {