Update CMakeLists.txt

Author: gammasoft71

src/Application/ApplicationIcon/CMakeLists.txt

@@ -5,20 +5,24 @@ find_package(wxWidgets REQUIRED)
 include(${wxWidgets_USE_FILE})
 link_libraries(${wxWidgets_LIBRARIES})
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Resources/Gammasoft.ico ${EXECUTABLE_OUTPUT_PATH}/Resources/Gammasoft.ico COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Resources/Gammasoft.ico ${EXECUTABLE_OUTPUT_PATH}/Debug/Resources/Gammasoft.ico COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Resources/Gammasoft.ico ${EXECUTABLE_OUTPUT_PATH}/Release/Resources/Gammasoft.ico COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Resources/Gammasoft.ico ${CMAKE_CURRENT_BINARY_DIR}/Resources/Gammasoft.ico COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Resources/Gammasoft.ico ${CMAKE_CURRENT_BINARY_DIR}/Debug/Resources/Gammasoft.ico COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Resources/Gammasoft.ico ${CMAKE_CURRENT_BINARY_DIR}/Release/Resources/Gammasoft.ico COPYONLY)
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Resources/Gammasoft.icns ${EXECUTABLE_OUTPUT_PATH}/Resources/Gammasoft.icns COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Resources/Gammasoft.icns ${EXECUTABLE_OUTPUT_PATH}/Debug/Resources/Gammasoft.icns COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Resources/Gammasoft.icns ${EXECUTABLE_OUTPUT_PATH}/Release/Resources/Gammasoft.icns COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Resources/Gammasoft.icns ${CMAKE_CURRENT_BINARY_DIR}/Resources/Gammasoft.icns COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Resources/Gammasoft.icns ${CMAKE_CURRENT_BINARY_DIR}/Debug/Resources/Gammasoft.icns COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Resources/Gammasoft.icns ${CMAKE_CURRENT_BINARY_DIR}/Release/Resources/Gammasoft.icns COPYONLY)
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Resources/Gammasoft.png ${EXECUTABLE_OUTPUT_PATH}/Resources/Gammasoft.png COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Resources/Gammasoft.png ${EXECUTABLE_OUTPUT_PATH}/Debug/Resources/Gammasoft.png COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Resources/Gammasoft.png ${EXECUTABLE_OUTPUT_PATH}/Release/Resources/Gammasoft.png COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Resources/Gammasoft.png ${CMAKE_CURRENT_BINARY_DIR}/Resources/Gammasoft.png COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Resources/Gammasoft.png ${CMAKE_CURRENT_BINARY_DIR}/Debug/Resources/Gammasoft.png COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Resources/Gammasoft.png ${CMAKE_CURRENT_BINARY_DIR}/Release/Resources/Gammasoft.png COPYONLY)
 
 if (MSVC)
   set(RESOURCES_FILE ${CMAKE_CURRENT_BINARY_DIR}/resources/${PROJECT_NAME}.rc)
+  
+  get_filename_component(ABSOLUTE_PATH_FILE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/Resources/Gammasoft.ico"  REALPATH BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+  string(REPLACE "/" "\\\\" ABSOLUTE_PATH_FILE_ICON ${ABSOLUTE_PATH_FILE_ICON})
+
   file(WRITE ${RESOURCES_FILE}
     "#pragma region CMake generated code\n"
     "// This code was generated by CMake script.\n"
@@ -30,10 +34,10 @@ if (MSVC)
     "LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL\n"
     "#pragma code_page(65001)\n"
     "\n"
-    "${IDI_EXECUTABLE_ICON}"
+    "IDI_APPLICATION ICON DISCARDABLE \"${ABSOLUTE_PATH_FILE_ICON}\"\n\n"
     "VS_VERSION_INFO VERSIONINFO\n"
-    " FILEVERSION ${FILE_VERSION}\n"
-    " PRODUCTVERSION ${PRODUCT_VERSION}\n"
+    " FILEVERSION 1,0,0,0\n"
+    " PRODUCTVERSION 1,0,0\n"
     " FILEFLAGSMASK 0x0L\n"
     "#if !defined(NDEBUG)\n"
     " FILEFLAGS VS_FF_DEBUG\n"
@@ -55,7 +59,7 @@ if (MSVC)
     "      VALUE \"LegalTrademarks2\", \"\"\n"
     "      VALUE \"OriginalFilename\", \"${PROJECT_NAME}.exe\"\n"
     "      VALUE \"ProductName\", \"\"\n"
-    "      VALUE \"ProductVersion\", \"1,0,0,0\"\n"
+    "      VALUE \"ProductVersion\", \"1,0,0\"\n"
     "    END\n"
     "  END\n"
     "  BLOCK \"VarFileInfo\"\n"