--- qsampler/trunk/src/CMakeLists.txt 2019/08/26 13:49:09 3570 +++ qsampler/trunk/src/CMakeLists.txt 2019/09/01 20:01:03 3589 @@ -1,20 +1,12 @@ set(NAME qsampler) include_directories ( - ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${QT_INCLUDES} -) - -link_directories ( ${CMAKE_CURRENT_BINARY_DIR} - ${QT_LIBRARY_DIR} ) configure_file (cmake_config.h ${CMAKE_CURRENT_BINARY_DIR}/config.h) -configure_file (${NAME}.desktop ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.desktop) - set (HEADERS qsampler.h qsamplerAbout.h @@ -117,16 +109,16 @@ ${SOURCES} ) +set_target_properties (${NAME} PROPERTIES CXX_STANDARD 11) + if (WIN32) - set_target_properties ($[NAME} PROPERTIES WIN32_EXECUTABLE true) + set_target_properties (${NAME} PROPERTIES WIN32_EXECUTABLE true) endif () if (APPLE) - set_target_properties ($[NAME} PROPERTIES MACOSX_BUNDLE true) + set_target_properties (${NAME} PROPERTIES MACOSX_BUNDLE true) endif () -target_compile_options (${NAME} PRIVATE -std=c++11) - target_link_libraries (${NAME} PRIVATE Qt5::Widgets) if (CONFIG_XUNIQUE) @@ -147,7 +139,7 @@ DESTINATION ${CMAKE_INSTALL_BINDIR}) install (FILES ${QM_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/${NAME}/translations) - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.desktop + install (FILES ${NAME}.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) install (FILES images/${NAME}.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/32x32/apps)