Revert "Cleanup config setup to make sure defines are set before config.h is generated."

This reverts commit 16b4cb93d8.

src/libtomahawk/CMakeLists.txt

@@ -6,16 +6,9 @@ add_definitions( -DDLLEXPORT_PRO )
 add_definitions( -DQT_SHAREDPOINTER_TRACK_POINTERS )
 add_definitions( -DPORTFWDDLLEXPORT_STATIC )
 
-IF( WIN32 )
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../tomahawk/Config.h.in
-  INCLUDE( "CMakeLists.win32.cmake" )
-ENDIF( WIN32 )
-IF( UNIX )
-  INCLUDE( "CMakeLists.unix.cmake" )
-ENDIF( UNIX )
-
-configure_file(Config.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-configure_file(TomahawkVersion.h.in
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../tomahawk/TomahawkVersion.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/TomahawkVersion.h)
 
 set( libGuiSources

src/tomahawk/CMakeLists.txt

@@ -109,6 +109,13 @@ INCLUDE_DIRECTORIES(
 
 SET( OS_SPECIFIC_LINK_LIBRARIES "" )
 
+IF( WIN32 )
+  INCLUDE( "CMakeLists.win32.cmake" )
+ENDIF( WIN32 )
+IF( UNIX )
+  INCLUDE( "CMakeLists.unix.cmake" )
+ENDIF( UNIX )
+
 IF( APPLE )
     SET( CMAKE_LINKER_FLAGS "-headerpad_max_install_names ${CMAKE_LINKER_FLAGS}" )
 
@@ -123,6 +130,12 @@ ENDIF( QCA2_FOUND )
 
 INCLUDE(GNUInstallDirs)
 
+# currently only in libtomahawk, we might want to properly split what's in which config file
+# configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.h.in
+#                ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+# configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TomahawkVersion.h.in
+#                ${CMAKE_CURRENT_BINARY_DIR}/TomahawkVersion.h)
+
 # translations
 include( ${CMAKE_SOURCE_DIR}/lang/translations.cmake )
 add_tomahawk_translations( ${TOMAHAWK_TRANSLATION_LANGUAGES} )