X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2FCMakeLists.txt;h=9af8c50aec1cd2f37204cdb620d8e6a09b0d4502;hp=67f0d5f9253e8b596b71b63d62e8eea203898815;hb=af5ee11e78a6c98f755d0cc5e3bef77028b227dd;hpb=60021fef0c9644e022095043a9072d5ad99c89e4 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 67f0d5f9..9af8c50a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,18 +1,18 @@ # Builds the three main targets add_subdirectory(common) -include_directories(common) +include_directories(BEFORE common) if(WANT_CORE OR WANT_MONO) add_subdirectory(core) - include_directories(core) + include_directories(BEFORE core) endif(WANT_CORE OR WANT_MONO) if(WANT_QTCLIENT OR WANT_MONO) add_subdirectory(client) add_subdirectory(uisupport) add_subdirectory(qtui) - include_directories(client) - include_directories(uisupport) - include_directories(qtui) + include_directories(BEFORE client) + include_directories(BEFORE uisupport) + include_directories(BEFORE qtui) # if(HAVE_KDE) # add_subdirectory(kdeui) # include_directories(kdeui) @@ -20,7 +20,7 @@ if(WANT_QTCLIENT OR WANT_MONO) # endif(HAVE_KDE) endif(WANT_QTCLIENT OR WANT_MONO) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) # for version.gen +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) # for version.gen # We always add stuff in :/pics qt4_add_resources(CLIENT_DEPS ../pics/pics.qrc) @@ -43,7 +43,7 @@ if(WANT_CORE) COMPILE_FLAGS "-DQT_NETWORK_LIB -DQT_SCRIPT_LIB -DQT_SQL_LIB -DBUILD_CORE" OUTPUT_NAME ../quasselcore) target_link_libraries(quasselcore mod_core mod_common - ${QUASSEL_QT_LIBRARIES} ${QUASSEL_KDE_LIBRARIES} ${QUASSEL_SSL_LIBRARIES}) + ${QUASSEL_QT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES}) install(TARGETS quasselcore RUNTIME DESTINATION ${BIN_INSTALL_DIR}) endif(WANT_CORE)