Skip to content
This repository was archived by the owner on Mar 26, 2020. It is now read-only.

Commit 7a2a1fe

Browse files
authored
Merge pull request #95 from Pfeifenjoy/master
CMake: installation if json11 is added as a library works now
2 parents 22ef927 + d3f504d commit 7a2a1fe

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
1313
endif()
1414

1515
add_library(json11 json11.cpp)
16-
target_include_directories(json11 PUBLIC ${CMAKE_SOURCE_DIR})
16+
target_include_directories(json11 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
1717
target_compile_options(json11
1818
PRIVATE -fPIC -fno-rtti -fno-exceptions -Wall -Wextra -Werror)
1919
configure_file("json11.pc.in" "json11.pc" @ONLY)
@@ -32,5 +32,5 @@ if (JSON11_BUILD_TESTS)
3232
endif()
3333

3434
install(TARGETS json11 DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE})
35-
install(FILES "${CMAKE_SOURCE_DIR}/json11.hpp" DESTINATION include/${CMAKE_LIBRARY_ARCHITECTURE})
36-
install(FILES "${CMAKE_BINARY_DIR}/json11.pc" DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig)
35+
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/json11.hpp" DESTINATION include/${CMAKE_LIBRARY_ARCHITECTURE})
36+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/json11.pc" DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig)

0 commit comments

Comments
 (0)