Commit86b5a30

committed

Merge pull request#515 from povilasb/0.11-devel-export-dependecy-libs

Export dependency libraries.

2 parentsfba104c +f51205f commit86b5a30Copy full SHA for 86b5a30

File tree

-7

lines changed

-7

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -119,11 +119,12 @@ export(PACKAGE cppnetlib)`
`119`	`119`	`file(RELATIVE_PATH REL_INCLUDE_DIR"${INSTALL_CMAKE_DIR}"`
`120`	`120`	`"${CMAKE_INSTALL_FULL_INCLUDEDIR}")`
`121`	`121`	`# ... for the build tree`
`122`		`-set(CONF_INCLUDE_DIRS"${PROJECT_SOURCE_DIR}")`
	`122`	`+set(CONF_INCLUDE_DIRS"${PROJECT_SOURCE_DIR}"${Boost_INCLUDE_DIRS})`
`123`	`123`	`configure_file(cppnetlibConfig.cmake.in`
`124`	`124`	`"${PROJECT_BINARY_DIR}/cppnetlibConfig.cmake" @ONLY)`
`125`	`125`	`# ... for the install tree`
`126`	`126`	`set(CONF_INCLUDE_DIRS"\${CPPNETLIB_CMAKE_DIR}/${REL_INCLUDE_DIR}")`
	`127`	`+set(CONF_INCLUDE_DIRS${CONF_INCLUDE_DIRS}${Boost_INCLUDE_DIRS})`
`127`	`128`	`configure_file(cppnetlibConfig.cmake.in`
`128`	`129`	`"${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cppnetlibConfig.cmake" @ONLY)`
`129`	`130`	`# ... for both`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,21 +3,21 @@`
`3`	`3`	`# CPPNETLIB_INCLUDE_DIRS - include directories for cppnetlib`
`4`	`4`	`# CPPNETLIB_LIBRARIES - libraries to link against`
`5`	`5`	`# CPPNETLIB_EXECUTABLE - the bar executable`
`6`		`-`
	`6`	`+`
`7`	`7`	`# Compute paths`
`8`	`8`	`get_filename_component(CPPNETLIB_CMAKE_DIR"${CMAKE_CURRENT_LIST_FILE}"PATH)`
`9`	`9`	`set(CPPNETLIB_INCLUDE_DIRS"@CONF_INCLUDE_DIRS@")`
`10`		`-`
	`10`	`+`
`11`	`11`	`# Our library dependencies (contains definitions for IMPORTED targets)`
`12`	`12`	`if(NOTTARGET cppnetlib-client-connections`
`13`	`13`	`ANDNOTTARGET cppnetlib-server-parsers`
`14`	`14`	`ANDNOTTARGET cppnetlib-uri`
`15`	`15`	`ANDNOTCPPNETLIB_BINARY_DIR)`
`16`	`16`	`include("${CPPNETLIB_CMAKE_DIR}/cppnetlibTargets.cmake")`
`17`	`17`	`endif()`
`18`		`-`
	`18`	`+`
`19`	`19`	`# These are IMPORTED targets created by cppnetlibTargets.cmake`
`20`		`-set(CPPNETLIB_LIBRARIES`
	`20`	`+set(CPPNETLIB_LIBRARIES`
`21`	`21`	`cppnetlib-client-connections`
`22`	`22`	`cppnetlib-server-parsers`
`23`	`23`	`cppnetlib-uri)`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`include_directories(${CPP-NETLIB_SOURCE_DIR})`
`10`	`10`
`11`		`-file(GLOB_RECURSE CPP-NETLIB_HEADERS`
	`11`	`+file(GLOB_RECURSE CPP-NETLIB_HEADERS`
`12`	`12`	`"${CPP-NETLIB_SOURCE_DIR}/boost/""*.hpp")`
`13`	`13`
`14`	`14`	`set(CPP-NETLIB_URI_SRCS uri/uri.cpp uri/schemes.cpp)`
`@@ -45,7 +45,7 @@ if (OPENSSL_FOUND)`
`45`	`45`	`target_link_libraries(cppnetlib-client-connections${OPENSSL_LIBRARIES})`
`46`	`46`	`endif ()`
`47`	`47`	`if (Boost_FOUND)`
`48`		`- target_link_libraries(cppnetlib-client-connections${Boost_System_LIBRARY})`
	`48`	`+ target_link_libraries(cppnetlib-client-connections${Boost_LIBRARIES})`
`49`	`49`	`endif ()`
`50`	`50`	`install(TARGETS cppnetlib-client-connections`
`51`	`51`	`EXPORT cppnetlibTargets`

Comments

(0)