Skip to content

Commit

Permalink
Project fixes
Browse files Browse the repository at this point in the history 
- fix cmake project
  • Loading branch information
@xodj
xodj committed Jun 16, 2021
1 parent 6f8b0f5 commit 0b82dd6
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ set_target_properties(RyzenAdjCtrl
endif(WIN32)
#Set output file path
set_target_properties(RyzenAdjCtrl
PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/APPFOLDER")
PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Appfolder")
#Add include directories
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../RyzenAdj)
Expand Down
54 changes: 27 additions & 27 deletions CopyDependencies.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,45 +13,45 @@ message("\nCopy Dependencies...\n")

set(COPIED_DEPENDENCIES TRUE CACHE BOOL "Dependencies have been copied, set to false to copy again" FORCE)

configure_file(Appfolder/Config/StyleSheet.xml ${PROJECT_BINARY_DIR}/APPFOLDER/Config/StyleSheet.xml COPYONLY)
configure_file(Appfolder/Theme/checkbox_checked.png ${PROJECT_BINARY_DIR}/APPFOLDER/Theme/checkbox_checked.png COPYONLY)
configure_file(Appfolder/Theme/checkbox_checked_disabled.png ${PROJECT_BINARY_DIR}/APPFOLDER/Theme/checkbox_checked_disabled.png COPYONLY)
configure_file(Appfolder/Theme/checkbox_checked_focus.png ${PROJECT_BINARY_DIR}/APPFOLDER/Theme/checkbox_checked_focus.png COPYONLY)
configure_file(Appfolder/Theme/checkbox_unchecked.png ${PROJECT_BINARY_DIR}/APPFOLDER/Theme/checkbox_unchecked.png COPYONLY)
configure_file(Appfolder/Theme/checkbox_unchecked_disabled.png ${PROJECT_BINARY_DIR}/APPFOLDER/Theme/checkbox_unchecked_disabled.png COPYONLY)
configure_file(Appfolder/Theme/checkbox_unchecked_focus.png ${PROJECT_BINARY_DIR}/APPFOLDER/Theme/checkbox_unchecked_focus.png COPYONLY)
configure_file(Appfolder/Theme/down_arrow.png ${PROJECT_BINARY_DIR}/APPFOLDER/Theme/down_arrow.png COPYONLY)
configure_file(Appfolder/Theme/down_arrow_disabled.png ${PROJECT_BINARY_DIR}/APPFOLDER/Theme/down_arrow_disabled.png COPYONLY)
configure_file(Appfolder/Theme/up_arrow.png ${PROJECT_BINARY_DIR}/APPFOLDER/Theme/up_arrow.png COPYONLY)
configure_file(Appfolder/Theme/up_arrow_disabled.png ${PROJECT_BINARY_DIR}/APPFOLDER/Theme/up_arrow_disabled.png COPYONLY)
configure_file(Appfolder/Config/StyleSheet.xml ${PROJECT_BINARY_DIR}/Appfolder/Config/StyleSheet.xml COPYONLY)
configure_file(Appfolder/Theme/checkbox_checked.png ${PROJECT_BINARY_DIR}/Appfolder/Theme/checkbox_checked.png COPYONLY)
configure_file(Appfolder/Theme/checkbox_checked_disabled.png ${PROJECT_BINARY_DIR}/Appfolder/Theme/checkbox_checked_disabled.png COPYONLY)
configure_file(Appfolder/Theme/checkbox_checked_focus.png ${PROJECT_BINARY_DIR}/Appfolder/Theme/checkbox_checked_focus.png COPYONLY)
configure_file(Appfolder/Theme/checkbox_unchecked.png ${PROJECT_BINARY_DIR}/Appfolder/Theme/checkbox_unchecked.png COPYONLY)
configure_file(Appfolder/Theme/checkbox_unchecked_disabled.png ${PROJECT_BINARY_DIR}/Appfolder/Theme/checkbox_unchecked_disabled.png COPYONLY)
configure_file(Appfolder/Theme/checkbox_unchecked_focus.png ${PROJECT_BINARY_DIR}/Appfolder/Theme/checkbox_unchecked_focus.png COPYONLY)
configure_file(Appfolder/Theme/down_arrow.png ${PROJECT_BINARY_DIR}/Appfolder/Theme/down_arrow.png COPYONLY)
configure_file(Appfolder/Theme/down_arrow_disabled.png ${PROJECT_BINARY_DIR}/Appfolder/Theme/down_arrow_disabled.png COPYONLY)
configure_file(Appfolder/Theme/up_arrow.png ${PROJECT_BINARY_DIR}/Appfolder/Theme/up_arrow.png COPYONLY)
configure_file(Appfolder/Theme/up_arrow_disabled.png ${PROJECT_BINARY_DIR}/Appfolder/Theme/up_arrow_disabled.png COPYONLY)

# Doesn't really make sense anywhere else
if(NOT MSVC)
return()
endif()

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../RyzenAdj/build/libryzenadj.dll ${PROJECT_BINARY_DIR}/APPFOLDER/libryzenadj.dll COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../RyzenAdj/win32/inpoutx64.dll ${PROJECT_BINARY_DIR}/APPFOLDER/inpoutx64.dll COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../RyzenAdj/win32/WinRing0x64.dll ${PROJECT_BINARY_DIR}/APPFOLDER/WinRing0x64.dll COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../RyzenAdj/win32/WinRing0x64.sys ${PROJECT_BINARY_DIR}/APPFOLDER/WinRing0x64.sys COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../RyzenAdj/build/libryzenadj.dll ${PROJECT_BINARY_DIR}/Appfolder/libryzenadj.dll COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../RyzenAdj/win32/inpoutx64.dll ${PROJECT_BINARY_DIR}/Appfolder/inpoutx64.dll COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../RyzenAdj/win32/WinRing0x64.dll ${PROJECT_BINARY_DIR}/Appfolder/WinRing0x64.dll COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../RyzenAdj/win32/WinRing0x64.sys ${PROJECT_BINARY_DIR}/Appfolder/WinRing0x64.sys COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/LICENSE ${PROJECT_BINARY_DIR}/LICENSE COPYONLY)

if(NOT CMAKE_BUILD_TYPE MATCHES "Debug")

configure_file(${CMAKE_PREFIX_PATH}/bin/Qt${QT_VERSION_MAJOR}Core.dll ${PROJECT_BINARY_DIR}/APPFOLDER/Qt${QT_VERSION_MAJOR}Core.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/bin/Qt${QT_VERSION_MAJOR}Gui.dll ${PROJECT_BINARY_DIR}/APPFOLDER/Qt${QT_VERSION_MAJOR}Gui.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/bin/Qt${QT_VERSION_MAJOR}Widgets.dll ${PROJECT_BINARY_DIR}/APPFOLDER/Qt${QT_VERSION_MAJOR}Widgets.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/plugins/imageformats/qico.dll ${PROJECT_BINARY_DIR}/APPFOLDER/ImageFormats/qico.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/plugins/platforms/qwindows.dll ${PROJECT_BINARY_DIR}/APPFOLDER/Platforms/qwindows.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/plugins/styles/qwindowsvistastyle.dll ${PROJECT_BINARY_DIR}/APPFOLDER/Styles/qwindowsvistastyle.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/bin/Qt${QT_VERSION_MAJOR}Core.dll ${PROJECT_BINARY_DIR}/Appfolder/Qt${QT_VERSION_MAJOR}Core.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/bin/Qt${QT_VERSION_MAJOR}Gui.dll ${PROJECT_BINARY_DIR}/Appfolder/Qt${QT_VERSION_MAJOR}Gui.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/bin/Qt${QT_VERSION_MAJOR}Widgets.dll ${PROJECT_BINARY_DIR}/Appfolder/Qt${QT_VERSION_MAJOR}Widgets.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/plugins/imageformats/qico.dll ${PROJECT_BINARY_DIR}/Appfolder/ImageFormats/qico.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/plugins/platforms/qwindows.dll ${PROJECT_BINARY_DIR}/Appfolder/Platforms/qwindows.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/plugins/styles/qwindowsvistastyle.dll ${PROJECT_BINARY_DIR}/Appfolder/Styles/qwindowsvistastyle.dll COPYONLY)

else(NOT CMAKE_BUILD_TYPE MATCHES "Debug")

configure_file(${CMAKE_PREFIX_PATH}/bin/Qt${QT_VERSION_MAJOR}Cored.dll ${PROJECT_BINARY_DIR}/APPFOLDER/Qt${QT_VERSION_MAJOR}Cored.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/bin/Qt${QT_VERSION_MAJOR}Guid.dll ${PROJECT_BINARY_DIR}/APPFOLDER/Qt${QT_VERSION_MAJOR}Guid.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/bin/Qt${QT_VERSION_MAJOR}Widgetsd.dll ${PROJECT_BINARY_DIR}/APPFOLDER/Qt${QT_VERSION_MAJOR}Widgetsd.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/plugins/imageformats/qicod.dll ${PROJECT_BINARY_DIR}/APPFOLDER/ImageFormats/qicod.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/plugins/platforms/qwindowsd.dll ${PROJECT_BINARY_DIR}/APPFOLDER/Platforms/qwindowsd.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/plugins/styles/qwindowsvistastyled.dll ${PROJECT_BINARY_DIR}/APPFOLDER/Styles/qwindowsvistastyled.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/bin/Qt${QT_VERSION_MAJOR}Cored.dll ${PROJECT_BINARY_DIR}/Appfolder/Qt${QT_VERSION_MAJOR}Cored.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/bin/Qt${QT_VERSION_MAJOR}Guid.dll ${PROJECT_BINARY_DIR}/Appfolder/Qt${QT_VERSION_MAJOR}Guid.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/bin/Qt${QT_VERSION_MAJOR}Widgetsd.dll ${PROJECT_BINARY_DIR}/Appfolder/Qt${QT_VERSION_MAJOR}Widgetsd.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/plugins/imageformats/qicod.dll ${PROJECT_BINARY_DIR}/Appfolder/ImageFormats/qicod.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/plugins/platforms/qwindowsd.dll ${PROJECT_BINARY_DIR}/Appfolder/Platforms/qwindowsd.dll COPYONLY)
configure_file(${CMAKE_PREFIX_PATH}/plugins/styles/qwindowsvistastyled.dll ${PROJECT_BINARY_DIR}/Appfolder/Styles/qwindowsvistastyled.dll COPYONLY)

endif(NOT CMAKE_BUILD_TYPE MATCHES "Debug")
6 changes: 3 additions & 3 deletions RyzenAdjCtrl.iss.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ Source: "Appfolder\Theme\up_arrow.png"; DestDir: "{app}\Theme\"; Flags: ignoreve
Source: "Appfolder\Theme\up_arrow_disabled.png"; DestDir: "{app}\Theme\"; Flags: ignoreversion
Source: "Appfolder\inpoutx64.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "Appfolder\libryzenadj.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "Appfolder\Qt6Core.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "Appfolder\Qt6Gui.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "Appfolder\Qt6Widgets.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "Appfolder\Qt${QT_VERSION_MAJOR}Core.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "Appfolder\Qt${QT_VERSION_MAJOR}Gui.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "Appfolder\Qt${QT_VERSION_MAJOR}Widgets.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "Appfolder\RyzenAdjCtrl.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "Appfolder\WinRing0x64.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "Appfolder\WinRing0x64.sys"; DestDir: "{app}"; Flags: ignoreversion
Expand Down

0 comments on commit 0b82dd6

Please sign in to comment.