Commit7287548

committed

Merge pull request#477 from infinity0/0.11-devel

Fix some packaging issues on 0.11 devel

2 parentsb28c807 +4c428ab commit7287548Copy full SHA for 7287548

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ include(GNUInstallDirs)`
`16`	`16`	`if(WIN32ANDNOTCYGWIN)`
`17`	`17`	`set(DEF_INSTALL_CMAKE_DIR CMake)`
`18`	`18`	`else()`
`19`		`- set(DEF_INSTALL_CMAKE_DIRlib/cmake/cppnetlib)`
	`19`	`+ set(DEF_INSTALL_CMAKE_DIR${CMAKE_INSTALL_LIBDIR}/cmake/cppnetlib)`
`20`	`20`	`endif()`
`21`	`21`	`set(INSTALL_CMAKE_DIR${DEF_INSTALL_CMAKE_DIR}CACHEPATH"Installation directory for CMake files")`
`22`	`22`
`@@ -48,7 +48,7 @@ set(CMAKE_VERBOSE_MAKEFILE true)`
`48`	`48`
`49`	`49`	`set(CPPNETLIB_VERSION_MAJOR 0)# MUST bump this whenever we make ABI-incompatible changes`
`50`	`50`	`set(CPPNETLIB_VERSION_MINOR 11)`
`51`		`-set(CPPNETLIB_VERSION_PATCH0)`
	`51`	`+set(CPPNETLIB_VERSION_PATCH1)`
`52`	`52`	`set(CPPNETLIB_VERSION_STRING${CPPNETLIB_VERSION_MAJOR}.${CPPNETLIB_VERSION_MINOR}.${CPPNETLIB_VERSION_PATCH})`
`53`	`53`
`54`	`54`	`if (CMAKE_BUILD_TYPEMATCHES Debug)`

Comments

(0)