Changeset 525


Ignore:
Timestamp:
Apr 23, 2015, 7:38:41 PM (7 years ago)
Author:
Joachim Langenbach
Message:
  • Fixed typos in test preparing custom commands
  • Fixed static name windres.exe to CMAKE_RC_COMPILER to support cross compilation
Location:
branches/0.5
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/0.5/CMakeLists.txt

    r524 r525  
    349349IF(WIN32)
    350350        ADD_CUSTOM_COMMAND(
    351                 OUTPUT "$EXECUTABLE_OUTPUT_PATH}/libengsas.dll"
     351                OUTPUT "${EXECUTABLE_OUTPUT_PATH}/libengsas.dll"
    352352                COMMAND ${CMAKE_COMMAND} -E copy_if_different "${LIBENGSAS_LIBRARIES}" "${EXECUTABLE_OUTPUT_PATH}"
    353353                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
    354354        )
    355355        ADD_CUSTOM_COMMAND(
    356                 OUTPUT "$EXECUTABLE_OUTPUT_PATH}/libengsas-testing.dll"
     356                OUTPUT "${EXECUTABLE_OUTPUT_PATH}/libengsas-testing.dll"
    357357                COMMAND ${CMAKE_COMMAND} -E copy_if_different "${LIBENGSAS_TESTING_LIBRARIES}" "${EXECUTABLE_OUTPUT_PATH}"
    358358                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
    359359        )
    360360        ADD_CUSTOM_COMMAND(
    361                 OUTPUT "$EXECUTABLE_OUTPUT_PATH}/libqca.dll"
     361                OUTPUT "${EXECUTABLE_OUTPUT_PATH}/libqca.dll"
    362362                COMMAND ${CMAKE_COMMAND} -E copy_if_different "${QCA2_LIBRARIES}" "${EXECUTABLE_OUTPUT_PATH}"
    363363                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
     
    366366                ADD_CUSTOM_TARGET(
    367367                        prepare_testing ALL
    368                         DEPENDS "$EXECUTABLE_OUTPUT_PATH}/libengsas.dll" "$EXECUTABLE_OUTPUT_PATH}/libengsas-testing.dll" "$EXECUTABLE_OUTPUT_PATH}/libqca.dll"
     368                        DEPENDS "${EXECUTABLE_OUTPUT_PATH}/libengsas.dll" "${EXECUTABLE_OUTPUT_PATH}/libengsas-testing.dll" "${EXECUTABLE_OUTPUT_PATH}/libqca.dll"
    369369                        COMMENT "Copying libengsas and qca shared libraries into EXECUTABLE_OUTPUT_PATH"
    370370                )
     
    372372                ADD_CUSTOM_TARGET(
    373373                        prepare_testing ALL
    374                         DEPENDS "$EXECUTABLE_OUTPUT_PATH}/libengsas.dll" "$EXECUTABLE_OUTPUT_PATH}/libengsas-testing.dll"
     374                        DEPENDS "${EXECUTABLE_OUTPUT_PATH}/libengsas.dll" "${EXECUTABLE_OUTPUT_PATH}/libengsas-testing.dll"
    375375                        COMMENT "Copying libengsas shared libraries into EXECUTABLE_OUTPUT_PATH"
    376376                )
  • branches/0.5/doc/src/CMakeLists.txt

    r520 r525  
    4040        #INSTALL(SCRIPT ${CMAKE_SOURCE_DIR}/cmake/doxygen_helper.cmake.in)
    4141        INSTALL(DIRECTORY "${APIDOC_DIR}/html"
    42                 DESTINATION ${apidocs_DIR}
     42                DESTINATION ${DOCDIR}
    4343                COMPONENT devapidocs
    4444        )
  • branches/0.5/src/meganizer/CMakeLists.txt

    r520 r525  
    129129                # resource compilation for MinGW
    130130                ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/meganizerico.o
    131                                                                                                 COMMAND windres.exe -I${CMAKE_CURRENT_SOURCE_DIR} -i${CMAKE_CURRENT_SOURCE_DIR}/meganizer.rc
     131                                                                                                COMMAND ${CMAKE_RC_COMPILER} -I${CMAKE_CURRENT_SOURCE_DIR} -i${CMAKE_CURRENT_SOURCE_DIR}/meganizer.rc
    132132                                                                                                                 -o ${CMAKE_CURRENT_BINARY_DIR}/meganizerico.o )
    133133                SET(meganizer_CPP ${meganizer_CPP} ${CMAKE_CURRENT_BINARY_DIR}/meganizerico.o)
Note: See TracChangeset for help on using the changeset viewer.