From 5298401f171ed5cabe5fa4566f7e8f94bf640e02 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Tue, 15 Jan 2013 01:27:29 +0100 Subject: [PATCH] Remove copy of Config.h.in from libtomahawk/ and install config.h from build dir --- src/libtomahawk/CMakeLists.txt | 4 +--- src/libtomahawk/Config.h.in | 29 ----------------------------- 2 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 src/libtomahawk/Config.h.in diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index b37f972bc..2d84d596d 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -471,9 +471,6 @@ INSTALL( TARGETS tomahawklib ) # Install header files -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.h.in - ${CMAKE_CURRENT_SOURCE_DIR}/config.h) - file( GLOB rootHeaders "*.h" ) file( GLOB accountsHeaders "accounts/*.h" ) file( GLOB accountsLastfmHeaders "accounts/lastfm/*.h" ) @@ -502,6 +499,7 @@ file( GLOB widgetsHeaders "widgets/*.h" ) file( GLOB widgetsInfowidgetsHeaders "widgets/infowidgets/*.h" ) file( GLOB widgetsSearchlineeditHeaders "widgets/searchlineedit/*.h" ) +install( FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h DESTINATION include/libtomahawk ) install( FILES ${rootHeaders} DESTINATION include/libtomahawk ) install( FILES ${accountsHeaders} DESTINATION include/libtomahawk/accounts ) install( FILES ${accountsLastfmHeaders} DESTINATION include/libtomahawk/accounts/lastfm ) diff --git a/src/libtomahawk/Config.h.in b/src/libtomahawk/Config.h.in deleted file mode 100644 index 1b1eb4af3..000000000 --- a/src/libtomahawk/Config.h.in +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef CONFIG_H_IN -#define CONFIG_H_IN - -#cmakedefine TOMAHAWK_ORGANIZATION_NAME "${TOMAHAWK_ORGANIZATION_NAME}" -#cmakedefine TOMAHAWK_ORGANIZATION_DOMAIN "${TOMAHAWK_ORGANIZATION_DOMAIN}" -#cmakedefine TOMAHAWK_APPLICATION_NAME "${TOMAHAWK_APPLICATION_NAME}" -#cmakedefine TOMAHAWK_VERSION "${TOMAHAWK_VERSION}" - -#cmakedefine DEBUG_BUILD - -#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" -#define CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}" -#define CMAKE_SYSTEM "${CMAKE_SYSTEM}" - -#cmakedefine LION -#cmakedefine SNOW_LEOPARD -#cmakedefine LEOPARD -#cmakedefine HAVE_SPARKLE -#cmakedefine HAVE_THUMBBUTTON - -#cmakedefine WITH_BREAKPAD -#cmakedefine WITH_CRASHREPORTER -#cmakedefine WITH_BINARY_ATTICA - - -#cmakedefine LIBLASTFM_FOUND -#cmakedefine QCA2_FOUND - -#endif // CONFIG_H_IN