Skip to content

Commit

Permalink
added MinSizeRel
Browse files Browse the repository at this point in the history
  • Loading branch information
sfiel committed Jun 15, 2016
1 parent 0b8d38c commit 85eee0f
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion cmake/Utils.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,13 @@ macro(RDM_FIND_OPENCV)
file(MAKE_DIRECTORY ${NOMACS_BUILD_DIRECTORY}/Release/plugins)
file(MAKE_DIRECTORY ${NOMACS_BUILD_DIRECTORY}/Debug/plugins)
file(MAKE_DIRECTORY ${NOMACS_BUILD_DIRECTORY}/RelWithDebInfo/plugins)
file(MAKE_DIRECTORY ${NOMACS_BUILD_DIRECTORY}/MinSizeRel/plugins)
file(GLOB dllpath ${OpenCV_DIR}/bin/Release/opencv_${opencvlib}*.dll)
file(GLOB dllpath ${OpenCV_DIR}/bin/RelWithDebInfo/opencv_${opencvlib}*.dll)
file(GLOB dllpath ${OpenCV_DIR}/bin/MinSizeRel/opencv_${opencvlib}*.dll)
file(COPY ${dllpath} DESTINATION ${NOMACS_BUILD_DIRECTORY}/Release/plugins)
file(COPY ${dllpath} DESTINATION ${NOMACS_BUILD_DIRECTORY}/RelWithDebInfo/plugins)
file(COPY ${dllpath} DESTINATION ${NOMACS_BUILD_DIRECTORY}/MinSizeRel/plugins)

set(RDM_ADDITIONAL_OPENCV_BINARIES ${RDM_ADDITIONAL_OPENCV_BINARIES} ${dllpath})
set(ADDITIONAL_OPENCV_PACKAGES_PATHS ${ADDITIONAL_OPENCV_PACKAGES_PATHS} ${dllpath})
Expand All @@ -86,6 +90,7 @@ macro(RDM_FIND_OPENCV)
file(GLOB dllpath ${OpenCV_DIR}/bin/Release/opencv_${opencvlib}*.dll)
file(COPY ${dllpath} DESTINATION ${NOMACS_BUILD_DIRECTORY}/Release)
file(COPY ${dllpath} DESTINATION ${NOMACS_BUILD_DIRECTORY}/RelWithDebInfo)
file(COPY ${dllpath} DESTINATION ${NOMACS_BUILD_DIRECTORY}/MinSizeRel)
set(RDM_OPENCV_BINARIES ${RDM_OPENCV_BINARIES} ${dllpath})

file(GLOB dllpath ${OpenCV_DIR}/bin/Debug/opencv_${opencvlib}*d.dll)
Expand All @@ -105,7 +110,7 @@ macro(RDM_PREPARE_PLUGIN)

MARK_AS_ADVANCED(CMAKE_INSTALL_PREFIX)

set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${CMAKE_BINARY_DIR})
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${CMAKE_BINARY_DIR})
find_package(nomacs)
if(NOT NOMACS_FOUND)
set(NOMACS_BUILD_DIRECTORY "NOT_SET" CACHE PATH "Path to the nomacs build directory")
Expand Down Expand Up @@ -189,6 +194,7 @@ macro(RDM_CREATE_TARGETS)
if(matches)
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND if 1==$<CONFIG:Release> ${CMAKE_COMMAND} -E copy ${matches} ${NOMACS_BUILD_DIRECTORY}/Release)
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND if 1==$<CONFIG:RelWithDebInfo> ${CMAKE_COMMAND} -E copy ${matches} ${NOMACS_BUILD_DIRECTORY}/RelWithDebInfo)
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND if 1==$<CONFIG:MinSizeRel> ${CMAKE_COMMAND} -E copy ${matches} ${NOMACS_BUILD_DIRECTORY}/MinSizeRel)
endif()
endforeach()

Expand All @@ -205,6 +211,7 @@ macro(RDM_CREATE_TARGETS)
if(matches)
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND if 1==$<CONFIG:Release> ${CMAKE_COMMAND} -E copy ${matches} ${NOMACS_BUILD_DIRECTORY}/Release/plugins)
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND if 1==$<CONFIG:RelWithDebInfo> ${CMAKE_COMMAND} -E copy ${matches} ${NOMACS_BUILD_DIRECTORY}/RelWithDebInfo/plugins)
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND if 1==$<CONFIG:MinSizeRel> ${CMAKE_COMMAND} -E copy ${matches} ${NOMACS_BUILD_DIRECTORY}/MinSizeRel/plugins)
endif()
endforeach()
else()
Expand All @@ -224,11 +231,13 @@ macro(RDM_CREATE_TARGETS)
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND if 1==$<CONFIG:Debug> ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${PROJECT_NAME}> ${NOMACS_BUILD_DIRECTORY}/Debug/plugins/)
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND if 1==$<CONFIG:Release> ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${PROJECT_NAME}> ${NOMACS_BUILD_DIRECTORY}/Release/plugins/)
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND if 1==$<CONFIG:RelWithDebInfo> ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${PROJECT_NAME}> ${NOMACS_BUILD_DIRECTORY}/RelWithDebInfo/plugins/)
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND if 1==$<CONFIG:MinSizeRel> ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${PROJECT_NAME}> ${NOMACS_BUILD_DIRECTORY}/MinSizeRel/plugins/)
if(${NUM_ADDITONAL_DLLS} GREATER 0)
foreach(DLL ${ADDITIONAL_DLLS})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND if 1==$<CONFIG:Debug> ${CMAKE_COMMAND} -E copy ${DLL} ${NOMACS_BUILD_DIRECTORY}/Debug/)
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND if 1==$<CONFIG:Release> ${CMAKE_COMMAND} -E copy ${DLL} ${NOMACS_BUILD_DIRECTORY}/Release/)
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND if 1==$<CONFIG:RelWithDebInfo> ${CMAKE_COMMAND} -E copy ${DLL} ${NOMACS_BUILD_DIRECTORY}/RelWithDebInfo/)
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND if 1==$<CONFIG:MinSizeRel> ${CMAKE_COMMAND} -E copy ${DLL} ${NOMACS_BUILD_DIRECTORY}/MinSizeRel/)
endforeach()
endif()

Expand Down

0 comments on commit 85eee0f

Please sign in to comment.