Merge pull request #278 from tfili/dll-fix

Fixed issue of convert dll being in the wrong directory on Windows.
KhronosGroup · Jun 3, 2014 · c95a65f · c95a65f
2 parents 3b7e820 + 3f3629a
commit c95a65f
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/converter/COLLADA2GLTF/CMakeLists.txt b/converter/COLLADA2GLTF/CMakeLists.txt
@@ -173,6 +173,12 @@ endif()
 
 add_library(collada2gltfConvert SHARED ${GLTF_SOURCES})
 
+#Make sure the dll is in the same directory as the executable
+if (WIN32)
+    set_target_properties(collada2gltfConvert PROPERTIES RUNTIME_OUTPUT_DIRECTORY "bin")
+endif()
+
+
 if (NOT WIN32)
 LIST(APPEND TARGET_LIBS ${PNG_LIBRARY} ${ZLIB_LIBRARY})
 endif()