diff options
| author | Ronan Collobert <ronan@collobert.com> | 2012-01-27 20:22:48 +0400 |
|---|---|---|
| committer | Ronan Collobert <ronan@collobert.com> | 2012-01-27 20:22:48 +0400 |
| commit | 4b1adce56e1851cbb624f0d3ed5eb308a8ae2992 (patch) | |
| tree | e53ed3a5d73bcf74b48ecc3c3f2f375bba07b4c5 /qtlua | |
| parent | 5c4055e772bdd787b425a3264e249262c8ea649c (diff) | |
made things a bit more modular (qtlua can now compile standalone)
Diffstat (limited to 'qtlua')
| -rw-r--r-- | qtlua/CMakeLists.txt | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/qtlua/CMakeLists.txt b/qtlua/CMakeLists.txt index f3a3cf2..6091bd9 100644 --- a/qtlua/CMakeLists.txt +++ b/qtlua/CMakeLists.txt @@ -26,15 +26,15 @@ SET_TARGET_PROPERTIES(libqtlua PROPERTIES # --- install library and include files INSTALL(TARGETS libqtlua - RUNTIME DESTINATION ${Torch_INSTALL_BIN_SUBDIR} - LIBRARY DESTINATION ${Torch_INSTALL_LIB_SUBDIR} - ARCHIVE DESTINATION ${Torch_INSTALL_LIB_SUBDIR} ) + RUNTIME DESTINATION ${QtLua_INSTALL_BIN_SUBDIR} + LIBRARY DESTINATION ${QtLua_INSTALL_LIB_SUBDIR} + ARCHIVE DESTINATION ${QtLua_INSTALL_LIB_SUBDIR} ) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/qtluaengine.h ${CMAKE_CURRENT_SOURCE_DIR}/qtluautils.h ${CMAKE_CURRENT_BINARY_DIR}/qtluaconf.h - DESTINATION ${Torch_INSTALL_INCLUDE_SUBDIR}/qtlua + DESTINATION ${QtLua_INSTALL_INCLUDE_SUBDIR}/qtlua ) # --- config for internal use @@ -42,8 +42,8 @@ INSTALL(FILES SET(QTLUA_LIBRARIES "libqtlua") SET(QTLUA_DEFINITIONS) CONFIGURE_FILE(QtLuaConfig.cmake.in - "${Torch_BINARY_DIR}/cmake/QtLuaConfig.cmake") -SET(QtLua_DIR "${Torch_BINARY_DIR}/cmake" CACHE PATH + "${QtLua_BINARY_DIR}/cmake/QtLuaConfig.cmake") +SET(QtLua_DIR "${QtLua_BINARY_DIR}/cmake" CACHE PATH "Directory containing QtLuaConfig.cmake") MARK_AS_ADVANCED(QtLua_DIR) @@ -51,10 +51,10 @@ MARK_AS_ADVANCED(QtLua_DIR) GET_TARGET_PROPERTY(QTLUA_OUTPUT_NAME libqtlua LOCATION) GET_FILENAME_COMPONENT(QTLUA_OUTPUT_NAME ${QTLUA_OUTPUT_NAME} NAME) -SET(QTLUA_LIBRARIES "${Torch_INSTALL_LIB}/${QTLUA_OUTPUT_NAME}") -SET(QTLUA_INCLUDE_DIR "${Torch_INSTALL_INCLUDE}/qtlua") +SET(QTLUA_LIBRARIES "${QtLua_INSTALL_LIB}/${QTLUA_OUTPUT_NAME}") +SET(QTLUA_INCLUDE_DIR "${QtLua_INSTALL_INCLUDE}/qtlua") CONFIGURE_FILE("QtLuaConfig.cmake.in" - "${Torch_BINARY_DIR}/cmake-external/QtLuaConfig.cmake") -INSTALL(FILES "${Torch_BINARY_DIR}/cmake-external/QtLuaConfig.cmake" - DESTINATION "${Torch_INSTALL_CMAKE_SUBDIR}") + "${QtLua_BINARY_DIR}/cmake-external/QtLuaConfig.cmake") +INSTALL(FILES "${QtLua_BINARY_DIR}/cmake-external/QtLuaConfig.cmake" + DESTINATION "${QtLua_INSTALL_CMAKE_SUBDIR}") |