Commit fe899f38 authored by Victor Yacovlev's avatar Victor Yacovlev

Win32/Qt4 possible fix

parent b5b390bf
......@@ -319,17 +319,14 @@ endfunction(kumir2_add_launcher)
function(kumir2_add_tool)
cmake_parse_arguments(PARSED_ARGS "" "NAME" "SOURCES;LIBRARIES;CXXFLAGS" ${ARGN})
if(NOT ${USE_QT} GREATER 4)
include_directories("${QT_INCLUDE_DIR}")
include_directories("${QT_INCLUDE_DIR}/Qt")
endif()
kumir2_use_qt(Core Gui)
if(WIN32 AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PARSED_ARGS_NAME}.rc")
list(APPEND PARSED_ARGS_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/${PARSED_ARGS_NAME}.rc")
add_executable(${PARSED_ARGS_NAME} WIN32 ${PARSED_ARGS_SOURCES})
if(${USE_QT} GREATER 4)
list(APPEND PARSED_ARGS_LIBRARIES ${Qt5Core_QTMAIN_LIBRARIES})
else()
list(APPEND QT_LIBRARIES ${QT_QTMAIN_LIBRARY})
list(APPEND PARSED_ARGS_LIBRARIES ${QT_QTMAIN_LIBRARY})
endif()
else()
add_executable(${PARSED_ARGS_NAME} ${PARSED_ARGS_SOURCES})
......
......@@ -7,7 +7,7 @@ endif()
add_opt_subdirectory(docbook2latex)
if(NOT APPLE)
# add_opt_subdirectory(open)
add_opt_subdirectory(open)
endif()
add_opt_subdirectory(courseeditor)
......
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