Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Obsidian fix -- wasn't generating IoObisidanInit.c, SRCS was wrong, i…

…nstall paths were wrong.
  • Loading branch information...
commit 556e594e810a5a5d557d44a72b4d543cfc59b2eb 1 parent 3289ffe
@jeremytregunna jeremytregunna authored
Showing with 8 additions and 2 deletions.
  1. +8 −2 addons/Obsidian/CMakeLists.txt
View
10 addons/Obsidian/CMakeLists.txt
@@ -9,8 +9,13 @@ make_build_bundle(_build)
# Output our dynamic library to the top-level _build hierarchy
set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/_build/dll)
+# Generate the IoObsidianInit.c file.
+# Argument SHOULD ALWAYS be the exact name of the addon, case is
+# important.
+generate_ioinit(Obsidian)
+
# Our library sources.
-file(GLOB SRCS "${CMAKE_CURRENT_SOURCE_DIR}/source/*.c")
+set(SRCS "${CMAKE_CURRENT_SOURCE_DIR}/source/IoObsidianInit.c")
# Now build the shared library
add_library(IoObsidian SHARED ${SRCS})
@@ -18,4 +23,5 @@ add_dependencies(IoObsidian iovmall)
target_link_libraries(IoObsidian iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Obsidian)
Please sign in to comment.
Something went wrong with that request. Please try again.