From f1ee06a269c5b3eb2c4f3871074094b843f93785 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 19 Sep 2016 20:23:52 +0000 Subject: [PATCH] mkspecs cleanup Signed-off-by: Ivailo Monev --- mkspecs/freebsd/freebsd.cmake | 17 --------- mkspecs/linux/linux.cmake | 17 --------- mkspecs/mkspecs.cmake | 30 ++++++++------- mkspecs/openbsd/qmake.conf | 89 ------------------------------------------- 4 files changed, 17 insertions(+), 136 deletions(-) delete mode 100644 mkspecs/linux/linux.cmake delete mode 100644 mkspecs/openbsd/qmake.conf diff --git a/mkspecs/freebsd/freebsd.cmake b/mkspecs/freebsd/freebsd.cmake index 6aff4c79b..c629c4fd0 100644 --- a/mkspecs/freebsd/freebsd.cmake +++ b/mkspecs/freebsd/freebsd.cmake @@ -1,18 +1 @@ -if("${KATIE_COMPILER}" MATCHES "(gcc|clang)") - set(QT_VISIBILITY_AVAILABLE TRUE) -endif() - add_definitions(-D_THREAD_SAFE) - -set(QT_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}") -set(QT_HEADERS_PATH "${QT_PREFIX_PATH}/include/katie") -set(QT_LIBRARIES_PATH "${QT_PREFIX_PATH}/lib/katie") -set(QT_BINARIES_PATH "${QT_LIBRARIES_PATH}/bin") -set(QT_PLUGINS_PATH "${QT_LIBRARIES_PATH}/plugins") -set(QT_IMPORTS_PATH "${QT_LIBRARIES_PATH}/imports") -set(QT_DATA_PATH "${QT_PREFIX_PATH}/share") -set(QT_TRANSLATIONS_PATH "${QT_DATA_PATH}/translations") -set(QT_DOCUMENTATION_PATH "${QT_DATA_PATH}/doc") -set(QT_EXAMPLES_PATH "${QT_DATA_PATH}/examples") -set(QT_DEMOS_PATH "${QT_DATA_PATH}/demos") -set(QT_SETTINGS_PATH "/etc/xdg") diff --git a/mkspecs/linux/linux.cmake b/mkspecs/linux/linux.cmake deleted file mode 100644 index 580eca68d..000000000 --- a/mkspecs/linux/linux.cmake +++ /dev/null @@ -1,17 +0,0 @@ -if("${KATIE_COMPILER}" MATCHES "(gcc|clang)") - set(QT_VISIBILITY_AVAILABLE TRUE) -endif() - -set(QT_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}") -set(QT_HEADERS_PATH "${QT_PREFIX_PATH}/include/katie") -set(QT_LIBRARIES_PATH "${QT_PREFIX_PATH}/lib/katie") -set(QT_BINARIES_PATH "${QT_LIBRARIES_PATH}/bin") -set(QT_PLUGINS_PATH "${QT_LIBRARIES_PATH}/plugins") -set(QT_IMPORTS_PATH "${QT_LIBRARIES_PATH}/imports") -set(QT_DATA_PATH "${QT_PREFIX_PATH}/share") -set(QT_TRANSLATIONS_PATH "${QT_DATA_PATH}/translations") -set(QT_DOCUMENTATION_PATH "${QT_DATA_PATH}/doc") -set(QT_EXAMPLES_PATH "${QT_DATA_PATH}/examples") -set(QT_DEMOS_PATH "${QT_DATA_PATH}/demos") -set(QT_SETTINGS_PATH "/etc/xdg") - diff --git a/mkspecs/mkspecs.cmake b/mkspecs/mkspecs.cmake index e6d56b859..1afb6aa4e 100644 --- a/mkspecs/mkspecs.cmake +++ b/mkspecs/mkspecs.cmake @@ -87,19 +87,23 @@ if(NOT KATIE_KEY) set(KATIE_KEY "${KATIE_ARCHITECTURE} ${KATIE_PLATFORM} ${KATIE_COMPILER} full-config") endif() -# forward setup of configuration paths, overriden by platform mkspecs -set(QT_PREFIX_PATH "" CACHE PATH "General installation prefix") -set(QT_HEADERS_PATH "" CACHE PATH "Headers installation path") -set(QT_LIBRARIES_PATH "" CACHE PATH "Libraries installation path") -set(QT_BINARIES_PATH "" CACHE PATH "Binaries installation path") -set(QT_PLUGINS_PATH "" CACHE PATH "Plugins installation path") -set(QT_IMPORTS_PATH "" CACHE PATH "Declerative imports installation path") -set(QT_DATA_PATH "" CACHE PATH "Generic data installation path") -set(QT_TRANSLATIONS_PATH "" CACHE PATH "Translations instllation path") -set(QT_DOCUMENTATION_PATH "" CACHE PATH "Documenation installation path") -set(QT_EXAMPLES_PATH "" CACHE PATH "Examples installation path") -set(QT_DEMOS_PATH "" CACHE PATH "Demos installation path") -set(QT_SETTINGS_PATH "" CACHE PATH "Settings runtime path") +if("${KATIE_COMPILER}" MATCHES "(gcc|clang)") + set(QT_VISIBILITY_AVAILABLE TRUE) +endif() + +# TODO: make use of GNUInstallDirs +set(QT_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}" CACHE PATH "General installation prefix") +set(QT_HEADERS_PATH "${QT_PREFIX_PATH}/include/katie" CACHE PATH "Headers installation path") +set(QT_LIBRARIES_PATH "${QT_PREFIX_PATH}/lib/katie" CACHE PATH "Libraries installation path") +set(QT_BINARIES_PATH "${QT_LIBRARIES_PATH}/bin" CACHE PATH "Binaries installation path") +set(QT_PLUGINS_PATH "${QT_LIBRARIES_PATH}/plugins" CACHE PATH "Plugins installation path") +set(QT_IMPORTS_PATH "${QT_LIBRARIES_PATH}/imports" CACHE PATH "Declerative imports installation path") +set(QT_DATA_PATH "${QT_PREFIX_PATH}/share" CACHE PATH "Generic data installation path") +set(QT_TRANSLATIONS_PATH "${QT_DATA_PATH}/translations" CACHE PATH "Translations instllation path") +set(QT_DOCUMENTATION_PATH "${QT_DATA_PATH}/doc" CACHE PATH "Documenation installation path") +set(QT_EXAMPLES_PATH "${QT_DATA_PATH}/examples" CACHE PATH "Examples installation path") +set(QT_DEMOS_PATH "${QT_DATA_PATH}/demos" CACHE PATH "Demos installation path") +set(QT_SETTINGS_PATH "/etc/xdg" CACHE PATH "Settings runtime path") if(EXISTS ${KATIE_MKSPECS_DIR}/${KATIE_PLATFORM}/${KATIE_PLATFORM}.cmake) include(${KATIE_MKSPECS_DIR}/${KATIE_PLATFORM}/${KATIE_PLATFORM}.cmake) diff --git a/mkspecs/openbsd/qmake.conf b/mkspecs/openbsd/qmake.conf deleted file mode 100644 index 56d94160e..000000000 --- a/mkspecs/openbsd/qmake.conf +++ /dev/null @@ -1,89 +0,0 @@ -# -# qmake configuration for openbsd-g++ -# - -MAKEFILE_GENERATOR = UNIX -TARGET_PLATFORM = unix -TEMPLATE = app -CONFIG += qt warn_on release link_prl gdb_dwarf_index -QT += core gui - -QMAKE_CC = gcc -QMAKE_LEX = flex -QMAKE_LEXFLAGS = -QMAKE_YACC = yacc -QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe -QMAKE_CFLAGS_DEPS = -M -QMAKE_CFLAGS_WARN_ON = -Wall -W -QMAKE_CFLAGS_WARN_OFF = -w -QMAKE_CFLAGS_RELEASE = -O2 -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = -fPIC -QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -QMAKE_CFLAGS_THREAD = -pthread - -QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD - -QMAKE_INCDIR = /usr/local/include -QMAKE_LIBDIR = /usr/local/lib -QMAKE_INCDIR_X11 = /usr/X11R6/include -QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] -QMAKE_INCDIR_OPENGL = /usr/X11R6/include -QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib - -QMAKE_LINK = g++ -QMAKE_LINK_SHLIB = g++ -QMAKE_LINK_C = gcc -QMAKE_LINK_C_SHLIB = gcc -QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $(LFLAGS) \ - $$QMAKE_CFLAGS_SHLIB $$QMAKE_LFLAGS \ - -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) -QMAKE_LFLAGS = -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -shared -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME = -Wl,-soname, -QMAKE_LFLAGS_THREAD = -pthread -QMAKE_LFLAGS_NOUNDEF = -Wl,-no_unresolved - -QMAKE_LIBS = -QMAKE_LIBS_DYNLOAD = -QMAKE_LIBS_X11 = -lXext -lX11 -lm -QMAKE_LIBS_X11SM = -lSM -lICE -QMAKE_LIBS_OPENGL = -lGL -QMAKE_LIBS_OPENGL_QT = -lGL -QMAKE_LIBS_THREAD = - -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc -QMAKE_UIC = $$[QT_INSTALL_BINS]/uic - -QMAKE_AR = ar q -QMAKE_OBJCOPY = objcopy -QMAKE_RANLIB = ranlib - -QMAKE_TAR = tar -cf -QMAKE_GZIP = gzip -9f - -QMAKE_COPY = cp -f -QMAKE_MOVE = mv -f -QMAKE_DEL_FILE = rm -f -QMAKE_DEL_DIR = rmdir -QMAKE_CHK_DIR_EXISTS = test -d -QMAKE_MKDIR = mkdir -p -include(../common/unix.conf) -load(qt_config) -- 2.11.0