From 3e621814143ebc433d2fa90c7765e4a159c2ada3 Mon Sep 17 00:00:00 2001 From: Guo Yunhe Date: Sat, 9 Nov 2019 11:10:45 +0200 Subject: [PATCH 1/5] Use LIBDIR instead of lib In Linux, the library should be installed to /usr/lib64 on 64bit machine --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d7dcced..ff221858 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -426,7 +426,7 @@ if(BUILD_TESTING) target_link_libraries(multifile_test ${LIBS}) add_test(NAME MultiFile_Test COMMAND multifile_test) - install(TARGETS test_module RUNTIME DESTINATION bin LIBRARY DESTINATION lib/chaiscript) + install(TARGETS test_module RUNTIME DESTINATION bin LIBRARY DESTINATION LIBDIR/chaiscript) endif() endif() @@ -439,7 +439,7 @@ if(BUILD_LIBFUZZ_TESTER) endif() -install(TARGETS chai chaiscript_stdlib-${CHAI_VERSION} ${MODULES} RUNTIME DESTINATION bin LIBRARY DESTINATION lib/chaiscript) +install(TARGETS chai chaiscript_stdlib-${CHAI_VERSION} ${MODULES} RUNTIME DESTINATION bin LIBRARY DESTINATION LIBDIR/chaiscript) install(DIRECTORY include/chaiscript DESTINATION include PATTERN "*.hpp" @@ -458,8 +458,8 @@ install(DIRECTORY samples DESTINATION share/chaiscript PATTERN "*/.git*" EXCLUDE PATTERN "*~" EXCLUDE) -configure_file(contrib/pkgconfig/chaiscript.pc.in lib/pkgconfig/chaiscript.pc @ONLY) +configure_file(contrib/pkgconfig/chaiscript.pc.in LIBDIR/pkgconfig/chaiscript.pc @ONLY) install(FILES "${chaiscript_BINARY_DIR}/lib/pkgconfig/chaiscript.pc" - DESTINATION lib/pkgconfig) + DESTINATION LIBDIR/pkgconfig) From 741893204aad5f147b0cba257279d98fc3e8bb7e Mon Sep 17 00:00:00 2001 From: Guo Yunhe Date: Sat, 9 Nov 2019 11:19:38 +0200 Subject: [PATCH 2/5] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ff221858..897fe3d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -458,7 +458,7 @@ install(DIRECTORY samples DESTINATION share/chaiscript PATTERN "*/.git*" EXCLUDE PATTERN "*~" EXCLUDE) -configure_file(contrib/pkgconfig/chaiscript.pc.in LIBDIR/pkgconfig/chaiscript.pc @ONLY) +configure_file(contrib/pkgconfig/chaiscript.pc.in lib/pkgconfig/chaiscript.pc @ONLY) install(FILES "${chaiscript_BINARY_DIR}/lib/pkgconfig/chaiscript.pc" DESTINATION LIBDIR/pkgconfig) From 63951d06f2af1ff80e97353927be74c73ec984e0 Mon Sep 17 00:00:00 2001 From: Guo Yunhe Date: Sat, 9 Nov 2019 11:36:31 +0200 Subject: [PATCH 3/5] Update CMakeLists.txt --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 897fe3d8..a2ca72e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -426,7 +426,7 @@ if(BUILD_TESTING) target_link_libraries(multifile_test ${LIBS}) add_test(NAME MultiFile_Test COMMAND multifile_test) - install(TARGETS test_module RUNTIME DESTINATION bin LIBRARY DESTINATION LIBDIR/chaiscript) + install(TARGETS test_module RUNTIME DESTINATION bin LIBRARY DESTINATION ${LIBDIR}/chaiscript) endif() endif() @@ -439,7 +439,7 @@ if(BUILD_LIBFUZZ_TESTER) endif() -install(TARGETS chai chaiscript_stdlib-${CHAI_VERSION} ${MODULES} RUNTIME DESTINATION bin LIBRARY DESTINATION LIBDIR/chaiscript) +install(TARGETS chai chaiscript_stdlib-${CHAI_VERSION} ${MODULES} RUNTIME DESTINATION bin LIBRARY DESTINATION ${LIBDIR}/chaiscript) install(DIRECTORY include/chaiscript DESTINATION include PATTERN "*.hpp" @@ -460,6 +460,6 @@ install(DIRECTORY samples DESTINATION share/chaiscript configure_file(contrib/pkgconfig/chaiscript.pc.in lib/pkgconfig/chaiscript.pc @ONLY) install(FILES "${chaiscript_BINARY_DIR}/lib/pkgconfig/chaiscript.pc" - DESTINATION LIBDIR/pkgconfig) + DESTINATION ${LIBDIR}/pkgconfig) From 0aa186abbe1ab9d5050bd9fcece88fc1596dd05c Mon Sep 17 00:00:00 2001 From: Guo Yunhe Date: Sat, 9 Nov 2019 11:37:32 +0200 Subject: [PATCH 4/5] Update CMakeLists.txt --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a2ca72e5..f04149bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -426,7 +426,7 @@ if(BUILD_TESTING) target_link_libraries(multifile_test ${LIBS}) add_test(NAME MultiFile_Test COMMAND multifile_test) - install(TARGETS test_module RUNTIME DESTINATION bin LIBRARY DESTINATION ${LIBDIR}/chaiscript) + install(TARGETS test_module RUNTIME DESTINATION bin LIBRARY DESTINATION "${LIBDIR}/chaiscript") endif() endif() @@ -439,7 +439,7 @@ if(BUILD_LIBFUZZ_TESTER) endif() -install(TARGETS chai chaiscript_stdlib-${CHAI_VERSION} ${MODULES} RUNTIME DESTINATION bin LIBRARY DESTINATION ${LIBDIR}/chaiscript) +install(TARGETS chai chaiscript_stdlib-${CHAI_VERSION} ${MODULES} RUNTIME DESTINATION bin LIBRARY DESTINATION "${LIBDIR}/chaiscript") install(DIRECTORY include/chaiscript DESTINATION include PATTERN "*.hpp" @@ -460,6 +460,6 @@ install(DIRECTORY samples DESTINATION share/chaiscript configure_file(contrib/pkgconfig/chaiscript.pc.in lib/pkgconfig/chaiscript.pc @ONLY) install(FILES "${chaiscript_BINARY_DIR}/lib/pkgconfig/chaiscript.pc" - DESTINATION ${LIBDIR}/pkgconfig) + DESTINATION "${LIBDIR}/pkgconfig") From cb1867dfd160f005425d0878b3758d1fe75072df Mon Sep 17 00:00:00 2001 From: Guo Yunhe Date: Sat, 9 Nov 2019 12:01:50 +0200 Subject: [PATCH 5/5] Update CMakeLists.txt --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f04149bc..7e1e754b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -426,7 +426,7 @@ if(BUILD_TESTING) target_link_libraries(multifile_test ${LIBS}) add_test(NAME MultiFile_Test COMMAND multifile_test) - install(TARGETS test_module RUNTIME DESTINATION bin LIBRARY DESTINATION "${LIBDIR}/chaiscript") + install(TARGETS test_module RUNTIME DESTINATION bin LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/chaiscript") endif() endif() @@ -439,7 +439,7 @@ if(BUILD_LIBFUZZ_TESTER) endif() -install(TARGETS chai chaiscript_stdlib-${CHAI_VERSION} ${MODULES} RUNTIME DESTINATION bin LIBRARY DESTINATION "${LIBDIR}/chaiscript") +install(TARGETS chai chaiscript_stdlib-${CHAI_VERSION} ${MODULES} RUNTIME DESTINATION bin LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/chaiscript") install(DIRECTORY include/chaiscript DESTINATION include PATTERN "*.hpp" @@ -460,6 +460,6 @@ install(DIRECTORY samples DESTINATION share/chaiscript configure_file(contrib/pkgconfig/chaiscript.pc.in lib/pkgconfig/chaiscript.pc @ONLY) install(FILES "${chaiscript_BINARY_DIR}/lib/pkgconfig/chaiscript.pc" - DESTINATION "${LIBDIR}/pkgconfig") + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")