mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FIX 2. missed included in installed nana consumed with cmake

Browse Source
This commit is contained in:
Ariel Vina-Rodriguez 2019-07-28 10:28:59 +02:00 committed by GitHub
parent de9043e223
commit 6c6d80b414
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/cmake/install_nana.cmake
View File

@ -6,7 +6,7 @@ if(NANA_CMAKE_INSTALL)
# Is your responsability to ensure all compiler options are compatible with the compilation # Is your responsability to ensure all compiler options are compatible with the compilation
# of the project linking to the nana lib here generated # of the project linking to the nana lib here generated
target_sources(nana PRIVATE ${HEADERS}) target_sources(nana PRIVATE ${HEADERS})
target_include_directories(nana PRIVATE ${NANA_INCLUDE_DIR}) # target_include_directories(nana PRIVATE ${NANA_INCLUDE_DIR})
message("The compiled Nana library will be installed in ${CMAKE_INSTALL_PREFIX}/lib") message("The compiled Nana library will be installed in ${CMAKE_INSTALL_PREFIX}/lib")
# Actually in DESTDIR/CMAKE_INSTALL_PREFIX/lib but in windows there is no DESTDIR/ part. # Actually in DESTDIR/CMAKE_INSTALL_PREFIX/lib but in windows there is no DESTDIR/ part.
install(TARGETS nana install(TARGETS nana
@ -15,6 +15,8 @@ if(NANA_CMAKE_INSTALL)
RUNTIME DESTINATION bin) RUNTIME DESTINATION bin)
install(DIRECTORY ${NANA_INCLUDE_DIR}/nana DESTINATION include) # in ${CMAKE_INSTALL_PREFIX}/include/nana install(DIRECTORY ${NANA_INCLUDE_DIR}/nana DESTINATION include) # in ${CMAKE_INSTALL_PREFIX}/include/nana
message("The Nana include files will be installed in ${CMAKE_INSTALL_PREFIX}/include") message("The Nana include files will be installed in ${CMAKE_INSTALL_PREFIX}/include")
target_include_directories(nana PUBLIC $<BUILD_INTERFACE:${NANA_INCLUDE_DIR}>
$<INSTALL_INTERFACE:include> )
else() else()
# this is the prefered method to consume nana with cmake # this is the prefered method to consume nana with cmake
target_sources(nana PUBLIC ${HEADERS}) target_sources(nana PUBLIC ${HEADERS})