Skip to content

Commit 629a727

Browse files
oleurodecisionbaylesj
authored andcommitted
version.h : wrong file was deployed, added required include path and
1 parent c51d718 commit 629a727

File tree

3 files changed

+8
-25
lines changed

3 files changed

+8
-25
lines changed

Diff for: include/CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
file(GLOB INCLUDE_FILES "json/*.h")
2-
install(FILES ${INCLUDE_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/json)
2+
install(FILES
3+
${INCLUDE_FILES}
4+
${PROJECT_BINARY_DIR}/include/json/version.h
5+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/json)
6+

Diff for: include/json/version.h

-22
This file was deleted.

Diff for: src/lib_json/CMakeLists.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ set( PUBLIC_HEADERS
4747
${JSONCPP_INCLUDE_DIR}/json/reader.h
4848
${JSONCPP_INCLUDE_DIR}/json/writer.h
4949
${JSONCPP_INCLUDE_DIR}/json/assertions.h
50-
${JSONCPP_INCLUDE_DIR}/json/version.h
50+
${PROJECT_BINARY_DIR}/include/json/version.h
5151
)
5252

5353
source_group( "Public API" FILES ${PUBLIC_HEADERS} )
@@ -141,5 +141,6 @@ install( TARGETS jsoncpp_lib ${INSTALL_EXPORT}
141141
if(NOT CMAKE_VERSION VERSION_LESS 2.8.11)
142142
target_include_directories( jsoncpp_lib PUBLIC
143143
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
144-
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/${JSONCPP_INCLUDE_DIR}>)
144+
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/${JSONCPP_INCLUDE_DIR}>
145+
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include/json>)
145146
endif()

0 commit comments

Comments
 (0)