Commit dbd359c6 authored by Jan Möbius's avatar Jan Möbius
Browse files

Fixed RCC Resource compiler problems (wrong path!)

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@18728 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 18c8337a
...@@ -238,9 +238,8 @@ macro (acg_qt5) ...@@ -238,9 +238,8 @@ macro (acg_qt5)
set (CMAKE_PREFIX_PATH ${QT5_INSTALL_PATH}) set (CMAKE_PREFIX_PATH ${QT5_INSTALL_PATH})
set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
set (QT_PLUGINS_DIR "${QT5_INSTALL_PATH}/plugins" CACHE PATH "") set (QT_PLUGINS_DIR "${QT5_INSTALL_PATH}/plugins" CACHE PATH "")
set (QT_BINARY_DIR "${QT5_INSTALL_PATH}/bin" CACHE PATH "Qt5 binary Directory") set (QT_BINARY_DIR "${QT5_INSTALL_PATH}/bin" CACHE PATH "Qt5 binary Directory")
set (QT_RCC_EXECUTABLE "${QT5_INSTALL_PATH}/bin/rcc" CACHE PATH "Path to the rcc executable")
#glu32.lib is needed by qt5 opengl version. it cannot find it by itself so we help qt #glu32.lib is needed by qt5 opengl version. it cannot find it by itself so we help qt
if ( WIN32 ) if ( WIN32 )
...@@ -633,10 +632,7 @@ macro (acg_qt5_autoqrc qrc_SRCS) ...@@ -633,10 +632,7 @@ macro (acg_qt5_autoqrc qrc_SRCS)
get_filename_component (_basename ${_current_FILE} NAME_WE) get_filename_component (_basename ${_current_FILE} NAME_WE)
set (_outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${_basename}.cpp) set (_outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${_basename}.cpp)
add_custom_command (OUTPUT ${_outfile} qt5_add_resources( ${_outfile} ${_abs_FILE} )
COMMAND ${QT_RCC_EXECUTABLE}
ARGS -o ${_outfile} ${_abs_FILE}
DEPENDS ${_abs_FILE})
add_file_dependencies (${_source} ${_outfile}) add_file_dependencies (${_source} ${_outfile})
set (${qrc_SRCS} ${${qrc_SRCS}} ${_outfile}) set (${qrc_SRCS} ${${qrc_SRCS}} ${_outfile})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment