diff --git a/CMakeLists.txt b/CMakeLists.txt index a070c84..946814d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,9 +39,9 @@ find_package(ZLIB 1.2 REQUIRED) #======================================= set(CMAKE_INCLUDE_CURRENT_DIR ON) -add_definitions (-std=c++11 -g) +add_compile_options (-std=c++11 -g) if (NOT WIN32) - add_definitions (-fPIC) + add_compile_options (-fPIC) endif () diff --git a/glabels/CMakeLists.txt b/glabels/CMakeLists.txt index d70bb38..d9957fe 100644 --- a/glabels/CMakeLists.txt +++ b/glabels/CMakeLists.txt @@ -153,11 +153,18 @@ qt5_wrap_cpp (glabels_moc_sources ${glabels_qobject_headers}) qt5_wrap_ui (glabels_forms_headers ${glabels_forms}) qt5_add_resources (glabels_qrc_sources ${glabels_resource_files}) +if (WIN32) + # Windows resource file + set (glabels_win_rc glabels.rc) +endif () + + add_executable (glabels-qt ${glabels_sources} ${glabels_moc_sources} ${glabels_qrc_sources} ${glabels_forms_headers} + ${glabels_win_rc} ) target_link_libraries (glabels-qt diff --git a/glabels/glabels.rc b/glabels/glabels.rc new file mode 100644 index 0000000..ec4a585 --- /dev/null +++ b/glabels/glabels.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "windows-icon/glabels.ico" diff --git a/glabels/windows-icon/glabels.ico b/glabels/windows-icon/glabels.ico new file mode 100644 index 0000000..1ff566a Binary files /dev/null and b/glabels/windows-icon/glabels.ico differ