diff --git a/CMakeLists.txt b/CMakeLists.txt index bb8220ea..b66e55d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,8 +23,6 @@ if (MSVC) set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT DobieQt) endif() -install(TARGETS DobieQt DESTINATION bin) - if (UNIX AND NOT APPLE) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/data/DobieStation.desktop.in diff --git a/cmake/DobieHelpers.cmake b/cmake/DobieHelpers.cmake index fa5c5da9..fa435f36 100644 --- a/cmake/DobieHelpers.cmake +++ b/cmake/DobieHelpers.cmake @@ -20,7 +20,7 @@ function(dobie_cxx_compile_options TARGET) ) target_compile_options(${TARGET} PRIVATE - $<$:${DOBIE_GNU_FLAGS}> + $<$,$,$>:${DOBIE_GNU_FLAGS}> $<$:${DOBIE_MSVC_FLAGS}>) # Needed to avoid ruining global scope with Windows.h on win32 diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt index d497a24c..c34015af 100644 --- a/src/qt/CMakeLists.txt +++ b/src/qt/CMakeLists.txt @@ -40,3 +40,5 @@ target_include_directories(${TARGET} PRIVATE ${CMAKE_SOURCE_DIR}/src ${Qt5Gui_PRIVATE_INCLUDE_DIRS}) target_link_libraries(${TARGET} Dobie::Core Qt5::Core Qt5::Widgets Qt5::Gui) + +install(TARGETS DobieQt RUNTIME DESTINATION bin)