Skip to content

Conversation

@Biswa96
Copy link
Contributor

@Biswa96 Biswa96 commented Mar 31, 2022

  • Include CMAKE_CURRENT_BINARY_DIR for version.h file in winapp.rc.
    Because version.h is now generated by cmake and put in build dir.
  • Quote default BUILD_VERSION value, else windres shows syntax error.

* Include CMAKE_CURRENT_BINARY_DIR for version.h file in winapp.rc.
  Because version.h is now generated by cmake and put in build dir.
* Quote default BUILD_VERSION value, else windres shows syntax error.
@justinclift
Copy link
Member

These sound like useful items to fix.

With the first one though (CMAKE_CURRENT_BINARY_DIR), that will remove the CMAKE_CURRENT_SOURCE_DIR from the include line. Are both needed?

@Biswa96
Copy link
Contributor Author

Biswa96 commented Apr 1, 2022

Are both needed?

As far I can see, winapp.rc only includes winver.h and version.h. So, CMAKE_CURRENT_SOURCE_DIR is not required. Also, the section is for mingw only and I am compiling with mingw toolchain.

@justinclift
Copy link
Member

Thanks, that makes sense to me. I'm just started the Continuous Integration tests, and if they pass then I'm happy to merge it. 😄

@MKleusberg
Copy link
Member

@justinclift I assume there were no issues with this PR? If so, let's merge it 😄

@justinclift
Copy link
Member

Oops. It's saying the CI tests were successful, so yeah merging it.

Thanks for the reminder. 😇

@justinclift justinclift merged commit 21aef52 into sqlitebrowser:master Jun 11, 2022
@Biswa96 Biswa96 deleted the windres-fix branch June 11, 2022 03:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants