From b91ee982b8ce1e08aad128a65312501ef5dd8ecd Mon Sep 17 00:00:00 2001 From: Iru Cai Date: Sun, 3 Apr 2016 00:22:30 +0800 Subject: CMakeLists.txt cleanup - remove qt4_automoc - set VERBOSE_MAKEFILE - set FQTERM_LIBS - remove trailing spaces and empty lines --- CMakeLists.txt.macos | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'CMakeLists.txt.macos') diff --git a/CMakeLists.txt.macos b/CMakeLists.txt.macos index 9016271..bc972df 100644 --- a/CMakeLists.txt.macos +++ b/CMakeLists.txt.macos @@ -1,17 +1,11 @@ find_package(OpenSSL REQUIRED) -set(CMAKE_VERBOSE_MAKEFILE ON) - ADD_DEFINITIONS(-Wall) -ADD_DEFINITIONS(-DFQTERM_VERSION_STRING="\\"${FQTERM_VERSION}\\"") - if(FQTERM_USE_STATIC_QT) ADD_DEFINITIONS(-DFQTERM_USE_STATIC_QT) endif(FQTERM_USE_STATIC_QT) -add_subdirectory(src) - find_library(APPKIT_LIBRARY AppKit) FIND_LIBRARY(CARBON_LIBRARY Carbon) @@ -57,6 +51,7 @@ if(FQTERM_USE_STATIC_QT) endif(FQTERM_USE_STATIC_QT) target_link_libraries(fqterm + ${FQTERM_LIBS} ${QT_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} @@ -67,16 +62,9 @@ target_link_libraries(fqterm ${FQ_QT_STATIC_PLUGINS} ${PYTHON_LIB} ${ZLIB_LIBRARIES} - ${QT_QTXML_LIBRARIES} - ssl + ${QT_QTXML_LIBRARIES} + ssl crypto - fqterm_common - fqterm_protocol - fqterm_terminal - fqterm_utilities - fqterm_ui - fqterm_main - fqterm_unite ) add_dependencies(fqterm -- cgit v1.2.3