commit d0497ad2cd385bbfe741542052cef91339d1dd3d
Author: Alex Mayfield <alexmax2742@gmail.com>
AuthorDate: Mon Jun 4 17:57:56 2018 -0400
Commit: Alex Mayfield <alexmax2742@gmail.com>
CommitDate: Mon Jun 4 17:57:56 2018 -0400
Address pull request comments
---
CMakeLists.txt | 5 +++--
config.h.cin => cmake/config.h.cin | 0
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 714b8f3b..58c200b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,7 +50,8 @@ include(CheckSymbolExists)
check_symbol_exists(strcasecmp "strings.h" HAVE_DECL_STRCASECMP)
check_symbol_exists(strncasecmp "strings.h" HAVE_DECL_STRNCASECMP)
-set(WINDOWS_RC_VERSION "${PROJECT_VERSION_MAJOR}, ${PROJECT_VERSION_MINOR}, ${PROJECT_VERSION_PATCH}, 0")
+string(CONCAT WINDOWS_RC_VERSION "${PROJECT_VERSION_MAJOR}, "
+ "${PROJECT_VERSION_MINOR}, ${PROJECT_VERSION_PATCH}, 0")
# Without a hyphen. This is used for the bash-completion scripts.
string(TOLOWER "${PACKAGE_SHORTNAME}" PROGRAM_SPREFIX)
@@ -58,7 +59,7 @@ string(TOLOWER "${PACKAGE_SHORTNAME}" PROGRAM_SPREFIX)
# With a hyphen, used almost everywhere else.
set(PROGRAM_PREFIX "${PROGRAM_SPREFIX}-")
-configure_file(config.h.cin config.h)
+configure_file(cmake/config.h.cin config.h)
configure_file(src/resource.rc.in src/resource.rc)
configure_file(src/setup-res.rc.in src/setup-res.rc)
diff --git a/config.h.cin b/cmake/config.h.cin
similarity index 100%
rename from config.h.cin
rename to cmake/config.h.cin