blob: 375f2e0ab6ca08c74979fbb00585f0ab581910cf (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
--- a/src/CMakeLists.txt 2017-10-17 14:22:57.780297490 +0200
+++ b/src/CMakeLists.txt 2017-10-17 14:24:21.754150453 +0200
@@ -962,12 +962,8 @@
endif()
# Standard Linux 'make install'
- install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
+ install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
install( PROGRAMS ${LINUX_LAUNCH_INSTALL_SCRIPT_CONFIGURED} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ RENAME ${PROJECT_NAME} )
- if( NOT USE_SYSTEM_LIBS OR NOT HUNSPELL_FOUND )
- install( PROGRAMS ${HUNSPELL_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
- endif()
- install( PROGRAMS ${GUMBO_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
if( BUILD_PATCHED_LIBXML2 )
install( PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libsigilxml2.so.2.9.4 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
install( FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libxml2.so.2 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
--- a/internal/gumbo/CMakeLists.txt 2017-10-17 14:25:02.539107666 +0200
+++ b/internal/gumbo/CMakeLists.txt 2017-10-17 14:25:27.985457056 +0200
@@ -40,4 +40,5 @@
if( UNIX AND NOT APPLE )
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99" )
+ install( TARGETS sigilgumbo DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
endif()
|
GitWeb
