shithub: choc

Info  •  Files  •  Log  •  Branches

Address pull request comments

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -50,7 +50,8 @@

 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 @@

 # 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)

--- /dev/null

+++ b/cmake/config.h.cin

@@ -1,0 +1,10 @@

+#cmakedefine PACKAGE_NAME "@PACKAGE_NAME@"

+#cmakedefine PACKAGE_TARNAME "@PACKAGE_TARNAME@"

+#cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@"

+#cmakedefine PACKAGE_STRING "@PACKAGE_STRING@"

+#cmakedefine PROGRAM_PREFIX "@PROGRAM_PREFIX@"

+

+#cmakedefine HAVE_LIBSAMPLERATE

+#cmakedefine HAVE_LIBPNG

+#cmakedefine01 HAVE_DECL_STRCASECMP

+#cmakedefine01 HAVE_DECL_STRNCASECMP

--- a/config.h.cin

+++ /dev/null

@@ -1,10 +1,0 @@

-#cmakedefine PACKAGE_NAME "@PACKAGE_NAME@"

-#cmakedefine PACKAGE_TARNAME "@PACKAGE_TARNAME@"

-#cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@"

-#cmakedefine PACKAGE_STRING "@PACKAGE_STRING@"

-#cmakedefine PROGRAM_PREFIX "@PROGRAM_PREFIX@"

-

-#cmakedefine HAVE_LIBSAMPLERATE

-#cmakedefine HAVE_LIBPNG

-#cmakedefine01 HAVE_DECL_STRCASECMP

-#cmakedefine01 HAVE_DECL_STRNCASECMP