Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed|CMake|Unix: Correct file name; rpath for standalone use
  • Loading branch information
skyjake committed May 24, 2015
1 parent 9a5920c commit 3924209
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions doomsday/cmake/FindAssimp.cmake
Expand Up @@ -18,16 +18,16 @@ if (NOT TARGET assimp)
# Try to find assimp manually.
find_library (LIBASSIMP NAMES assimp assimpd
PATHS
${DENG_EXTERNAL_SOURCE_DIR}/assimp
${ASSIMP_DIR}
${DENG_EXTERNAL_SOURCE_DIR}/assimp
${ASSIMP_DIR}
PATH_SUFFIXES lib/Release lib/Debug lib
NO_DEFAULT_PATH
NO_DEFAULT_PATH
)
endif ()
mark_as_advanced (LIBASSIMP)

if (NOT LIBASSIMP)
message (FATAL_ERROR "Open Asset Import Library not found. Go to doomsday/external/assimp, compile, and install. You can also set the ASSIMP_DIR variable to specify the location.")
message (FATAL_ERROR "Open Asset Import Library not found. Go to ${DENG_EXTERNAL_SOURCE_DIR}/assimp and compile. If you install it somewhere, set the ASSIMP_DIR variable to specify the location.")
endif ()

add_library (assimp INTERFACE)
Expand Down
2 changes: 1 addition & 1 deletion doomsday/cmake/Macros.cmake
Expand Up @@ -124,7 +124,7 @@ macro (deng_target_rpath target)
elseif (UNIX)
set_property (TARGET ${target}
PROPERTY INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/${DENG_INSTALL_PLUGIN_DIR};${CMAKE_INSTALL_PREFIX}/${DENG_INSTALL_LIB_DIR}"
"${CMAKE_INSTALL_PREFIX}/${DENG_INSTALL_PLUGIN_DIR};${CMAKE_INSTALL_PREFIX}/${DENG_INSTALL_LIB_DIR};$ORIGIN/../${DENG_INSTALL_PLUGIN_DIR};$ORIGIN/../${DENG_INSTALL_LIB_DIR}"
)
endif ()
endmacro (deng_target_rpath)
Expand Down
2 changes: 1 addition & 1 deletion doomsday/cmake/Packaging.cmake
Expand Up @@ -16,7 +16,7 @@ else ()
endif ()

if (DENG_BUILD AND NOT DENG_STABLE)
set (CPACK_PACKAGE_FILE_NAME doomsday_${DENG_VERSION}-build${DENG_BULD}_${DENG_ARCH})
set (CPACK_PACKAGE_FILE_NAME doomsday_${DENG_VERSION}-build${DENG_BUILD}_${DENG_ARCH})
else ()
set (CPACK_PACKAGE_FILE_NAME doomsday_${DENG_VERSION}_${DENG_ARCH})
endif ()
Expand Down

0 comments on commit 3924209

Please sign in to comment.