Changeset 224


Ignore:
Timestamp:
Jul 30, 2010, 8:34:18 PM (11 years ago)
Author:
Joachim Langenbach
Message:
  • some changes to get CTest run on Windows out of the box
    • All libs and bin are copied during linking into one directory (EXECUTABLE_OUTPUT_PATH = LIBRARY_OUTPUT_PATH)
  • Hint: %QTDIR%\qt\bin must be the first entry with qt-libs, to find the needed libraries correctly


Location:
branches/release-0.3.0-rc1
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/release-0.3.0-rc1

    • Property svn:ignore set to
      build
  • branches/release-0.3.0-rc1/CMakeLists.txt

    r222 r224  
    4545# Set the same linker and compiler flags as KDE uses, because they are much stronger
    4646IF(NOT KDE)
    47         SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
    48         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common")
     47        #SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")
     48        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common")
     49        IF(NOT WIN32)
     50                SET(CMAKE_CXX_FLAGS "$CMAKE_SHARED_LINKER_FLAGS -lc")
     51                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi")
     52        ENDIF(NOT WIN32)
    4953ENDIF(NOT KDE)
    5054
     
    9397#  SET(designer_DIR "/usr/lib/qt4/plugins/designer")
    9498        SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
    95         SET(EXECUTEABLE_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH}/bin)
     99        SET(EXECUTABLE_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH}/bin)
    96100ELSE(UNIX)
    97101        SET(PLUGINDIR ${bin_DIR}/plugins)
     
    101105        SET(DOCDIR ${bin_DIR}/doc)
    102106        SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
    103         SET(EXECUTEABLE_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH})
     107        SET(EXECUTABLE_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH})
    104108ENDIF(UNIX)
    105109SET(MINPLUGINDIR ${PLUGINDIR}/minvalidator)
  • branches/release-0.3.0-rc1/src/MediaDBLib/tests/CMakeLists.txt

    r221 r224  
    3333        mediadblib
    3434)
    35 ADD_TEST(MIN-Validator minvalidatortests)
     35ADD_TEST(MIN-Validator ${EXECUTABLE_OUTPUT_PATH}/minvalidatortests)
    3636
    3737###################################
     
    4747        mediadblib
    4848)
    49 ADD_TEST(MINModelTest minmodeltest)
     49ADD_TEST(MINModelTest ${EXECUTABLE_OUTPUT_PATH}/minmodeltest)
    5050
    5151###################################
     
    6161        mediadblib
    6262)
    63 ADD_TEST(PersonsModelTest personsmodeltest)
     63ADD_TEST(PersonsModelTest ${EXECUTABLE_OUTPUT_PATH}/personsmodeltest)
    6464
    6565###################################
     
    7575        mediadblib
    7676)
    77 ADD_TEST(MaterialPersonsModelTest materialpersonsmodeltest)
     77ADD_TEST(MaterialPersonsModelTest ${EXECUTABLE_OUTPUT_PATH}/materialpersonsmodeltest)
    7878
    7979###################################
     
    8989        mediadblib
    9090)
    91 ADD_TEST(MimeTypeModelTest mimetypemodeltest)
     91ADD_TEST(MimeTypeModelTest ${EXECUTABLE_OUTPUT_PATH}/mimetypemodeltest)
    9292
    9393###################################
     
    103103        mediadblib
    104104)
    105 ADD_TEST(MediaModelTest mediamodeltest)
     105ADD_TEST(MediaModelTest ${EXECUTABLE_OUTPUT_PATH}/mediamodeltest)
  • branches/release-0.3.0-rc1/src/MediaPlugins/Books/isbnvalidatorplugin/CMakeLists.txt

    r220 r224  
    9191        )
    9292
    93         ADD_TEST(ISBN-Validator isbnvalidatortests)
     93        ADD_TEST(ISBN-Validator ${EXECUTABLE_OUTPUT_PATH}/isbnvalidatortests)
    9494ENDIF(BUILD_TESTING)
  • branches/release-0.3.0-rc1/src/mediadb/tests/CMakeLists.txt

    r223 r224  
    3535        mediadblib
    3636)
    37 ADD_TEST(ProjectsModelTest projectsmodeltest)
     37ADD_TEST(ProjectsModelTest ${EXECUTABLE_OUTPUT_PATH}/projectsmodeltest)
    3838
Note: See TracChangeset for help on using the changeset viewer.