| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980 |
- From: Yanhao Mo <yanhaocs@gmail.com>
- Date: Wed, 16 May 2018 13:16:20 +0800
- Subject: use system libs
- ---
- CMakeLists.txt | 25 +++++--------------------
- 1 file changed, 5 insertions(+), 20 deletions(-)
- diff --git a/CMakeLists.txt b/CMakeLists.txt
- index 9d57aca..47f83d7 100644
- --- a/CMakeLists.txt
- +++ b/CMakeLists.txt
- @@ -24,6 +24,7 @@ pkg_check_modules(RSVG REQUIRED librsvg-2.0)
- pkg_check_modules(WNCK REQUIRED libwnck-3.0)
- pkg_check_modules(FONTCONFIG REQUIRED fontconfig)
- pkg_check_modules(GLIB REQUIRED glib-2.0)
- +pkg_check_modules(VTE REQUIRED vte-2.91)
-
- OPTION(TEST_BUILD "Build with native testing" ON)
-
- @@ -44,22 +45,6 @@ execute_process(
- )
- endif()
-
- -ExternalProject_Add(Vte-0.29
- - SOURCE_DIR ${CMAKE_SOURCE_DIR}/3rdparty/vte-0.50.1
- - CONFIGURE_COMMAND ./configure --enable-static
- - BUILD_COMMAND make
- - INSTALL_COMMAND ""
- - BUILD_IN_SOURCE 1
- - )
- -
- -ExternalProject_Add(zssh-1.5c
- - SOURCE_DIR ${CMAKE_SOURCE_DIR}/3rdparty/zssh-1.5c
- - CONFIGURE_COMMAND ./configure
- - BUILD_COMMAND make
- - INSTALL_COMMAND ""
- - BUILD_IN_SOURCE 1
- - )
- -
- set(CFLAGS
- ${GIO_CFLAGS}
- ${GTK3_CFLAGS} ${GTK3_CFLAGS_OTHER}
- @@ -79,7 +64,7 @@ set(INCLUDE_PATHS
- ${RSVG_INCLUDE_DIRS}
- ${JsonGlib_INCLUDE_DIRS}
- ${LIBSECRET_INCLUDE_DIRS}
- - ${CMAKE_SOURCE_DIR}/3rdparty/vte-0.50.1/src
- + ${VTE_INCLUDE_DIRS}
- )
- find_library(VTE_LIB NAMES libvte-2.91.a tcmalloc_minimal)
- include_directories(${INCLUDE_PATHS})
- @@ -96,6 +81,7 @@ set(LIBS
- ${XTST_LIBRARIES}
- ${FONTCONFIG_LIBRARY}
- ${M_LIBRARIES}
- + ${VTE_LIBRARIES}
- stdc++
- m
- z
- @@ -137,8 +123,7 @@ PACKAGES
- librsvg-2.0
- )
- add_executable(${target} ${VALA_C} ${CMAKE_SOURCE_DIR}/project_path.c ${CMAKE_SOURCE_DIR}/lib/font.c)
- -target_link_libraries(${target} ${LIBS} ${CMAKE_SOURCE_DIR}/3rdparty/vte-0.50.1/src/.libs/libvte-2.91.a)
- -add_dependencies(${target} Vte-0.29)
- +target_link_libraries(${target} ${LIBS})
-
- FILE(GLOB children LIST_DIRECTORIES true po/*)
- SET(dirlist "")
- @@ -170,7 +155,7 @@ FOREACH(lang ${dirlist})
- ENDFOREACH(lang)
-
- INSTALL (TARGETS ${target} DESTINATION bin)
- -INSTALL (PROGRAMS ssh_login.sh ${CMAKE_SOURCE_DIR}/3rdparty/zssh-1.5c/zssh DESTINATION lib/${target})
- +INSTALL (PROGRAMS ssh_login.sh DESTINATION lib/${target})
- INSTALL (FILES hicolor/32x32/${target}.png DESTINATION share/icons/hicolor/32x32/apps)
- INSTALL (FILES hicolor/48x48/${target}.png DESTINATION share/icons/hicolor/48x48/apps)
- INSTALL (FILES hicolor/96x96/${target}.png DESTINATION share/icons/hicolor/96x96/apps)
|
