Changeset 186


Ignore:
Timestamp:
Jul 12, 2010, 12:07:46 PM (11 years ago)
Author:
Joachim Langenbach
Message:
  • refs #84
  • Changed many thins to integrate the documentation into the CMake build structure
Location:
branches/release-0.3.0-rc1
Files:
8 added
1 deleted
8 edited
4 moved

Legend:

Unmodified
Added
Removed
  • branches/release-0.3.0-rc1/src/MediaDBLib/CMakeLists.txt

    r184 r186  
    152152        IF(BUILD_DEV)
    153153    SET_TARGET_PROPERTIES(mediadblib PROPERTIES
    154       OUTPUT_NAME "mediadb"
     154      OUTPUT_NAME "mediadb${TARGET_VERSION_MAJOR}"
    155155                        VERSION ${${PROJECT_NAME}_VERSION}
    156156      SOVERSION ${${PROJECT_NAME}_SOVERSION})
  • branches/release-0.3.0-rc1/src/MediaDBLib/DesignerPlugin/CMakeLists.txt

    r165 r186  
    3232        ${CMAKE_CURRENT_BINARY_DIR}
    3333        ${CMAKE_CURRENT_SOURCE_DIR}
    34         ${mediadb_SOURCE_DIR}/MediaDBLib
    35   ${mediadb_BINARY_DIR}/MediaDBLib
     34        ${mediadblib_SOURCE_DIR}
     35  ${mediadblib_BINARY_DIR}
    3636)
    37 LINK_DIRECTORIES(${mediadb_SOURCE_DIR}/MediaDBLib)
     37LINK_DIRECTORIES(${mediadblib_SOURCE_DIR}})
    3838
    3939QT4_WRAP_UI(designer_UI_H ${designer_UI})
  • branches/release-0.3.0-rc1/src/MediaPlugins/Books/CMakeLists.txt

    r182 r186  
    2929INCLUDE_DIRECTORIES(
    3030  ${QT_INCLUDES}
    31   ${mediadb_BINARY_DIR}/MediaDBLib
    32   ${mediadb_SOURCE_DIR}/MediaDBLib
     31  ${mediadblib_SOURCE_DIR}
     32  ${mediadblib_BINARY_DIR}
    3333  ${CMAKE_CURRENT_BINARY_DIR}
    3434  ${CMAKE_CURRENT_SOURCE_DIR}
    3535)
    36 LINK_DIRECTORIES(${mediadb_SOURCE_DIR}/MediaDBLib)                                                           
     36LINK_DIRECTORIES(${mediadblib_SOURCE_DIR})                                                           
    3737
    3838# needed for QT-Plugins
  • branches/release-0.3.0-rc1/src/MediaPlugins/CDs/CMakeLists.txt

    r182 r186  
    3333INCLUDE_DIRECTORIES(
    3434  ${QT_INCLUDES}
    35   ${mediadb_BINARY_DIR}/MediaDBLib
    36   ${mediadb_SOURCE_DIR}/MediaDBLib
     35  ${mediadblib_SOURCE_DIR}
     36  ${mediadblib_BINARY_DIR}
    3737  ${CMAKE_CURRENT_BINARY_DIR}
    3838  ${CMAKE_CURRENT_SOURCE_DIR}
    3939)
    40 LINK_DIRECTORIES(${mediadb_SOURCE_DIR}/MediaDBLib)                                                           
     40LINK_DIRECTORIES(${mediadblib_SOURCE_DIR})                                                           
    4141
    4242# needed for QT-Plugins
  • branches/release-0.3.0-rc1/src/SearchPlugins/Amazon/CMakeLists.txt

    r182 r186  
    3636INCLUDE_DIRECTORIES(
    3737        ${QT_INCLUDES}
    38   ${mediadb_BINARY_DIR}/MediaDBLib
    39   ${mediadb_SOURCE_DIR}/MediaDBLib
     38  ${mediadblib_SOURCE_DIR}
     39  ${mediadblib_BINARY_DIR}
    4040  ${CMAKE_CURRENT_BINARY_DIR}
    4141  ${CMAKE_CURRENT_SOURCE_DIR}
    4242  ${QCA2_INCLUDE_DIR}
    4343)
    44 LINK_DIRECTORIES(${mediadb_SOURCE_DIR}/MediaDBLib)
     44LINK_DIRECTORIES(${mediadblib_SOURCE_DIR})
    4545
    4646IF(WIN32)
  • branches/release-0.3.0-rc1/src/SearchPlugins/DemoShop/CMakeLists.txt

    r182 r186  
    1818INCLUDE_DIRECTORIES(
    1919  ${QT_INCLUDES}
    20   ${mediadb_BINARY_DIR}/MediaDBLib
    21   ${mediadb_SOURCE_DIR}/MediaDBLib
     20  ${mediadblib_SOURCE_DIR}
     21  ${mediadblib_BINARY_DIR}
    2222  ${CMAKE_CURRENT_BINARY_DIR}
    2323  ${CMAKE_CURRENT_SOURCE_DIR}
    2424)
    25 LINK_DIRECTORIES(${mediadb_SOURCE_DIR}/MediaDBLib)
     25LINK_DIRECTORIES(${mediadblib_SOURCE_DIR})
    2626
    2727IF(WIN32)
  • branches/release-0.3.0-rc1/src/mediadb/CMakeLists.txt

    r179 r186  
    5151INCLUDE_DIRECTORIES(
    5252  ${QT_INCLUDES}
    53   ${mediadb_SOURCE_DIR}/MediaDBLib
    54   ${mediadb_BINARY_DIR}/MediaDBLib
     53  ${mediadblib_SOURCE_DIR}
     54  ${mediadblib_BINARY_DIR}
    5555  ${CMAKE_CURRENT_BINARY_DIR}
    5656        ${CMAKE_CURRENT_SOURCE_DIR}
    5757)
    5858INCLUDE(${QT_USE_FILE})
    59 LINK_DIRECTORIES(${mediadb_SOURCE_DIR}/MediaDBLib)
     59LINK_DIRECTORIES(${mediadblib_SOURCE_DIR})
    6060
    6161IF(WIN32)
  • branches/release-0.3.0-rc1/src/mediadb/mediendb.cpp

    r182 r186  
    1818 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
    1919 ***************************************************************************/
    20 #include "config.h"
     20#include "mediadbconfig.h"
    2121
    2222#include "mediendb.h"
Note: See TracChangeset for help on using the changeset viewer.