Commit 3aa17993 authored by Antoine Regimbeau's avatar Antoine Regimbeau

Various indentation fixes

parent a8126204
......@@ -186,6 +186,4 @@ set(GTK_LIB_LIST_1
# libpng12.so.0
# )
#set(ALLOWED_SYSTEM_DLLS ${GTK_LIB_LIST_1} ${GTK_LIB_LIST_2})
set(ALLOWED_SYSTEM_DLLS ${GTK_LIB_LIST_1}) # ${GTK_LIB_LIST_2})
......@@ -22,36 +22,36 @@ macro(cleanup_package)
if(EXISTS "${CMAKE_INSTALL_PREFIX}/${PKG_STAGE_DIR}")
message(STATUS "Deleting package staging directory: ${CMAKE_INSTALL_PREFIX}/${PKG_STAGE_DIR}")
execute_process(COMMAND
${CMAKE_COMMAND} -E remove_directory
"${CMAKE_INSTALL_PREFIX}/${PKG_STAGE_DIR}"
RESULT_VARIABLE cleanup_stagedir_rv
OUTPUT_VARIABLE cleanup_stagedir_ov
ERROR_VARIABLE cleanup_stagedir_ov
)
message(STATUS "Deleting package staging directory: ${CMAKE_INSTALL_PREFIX}/${PKG_STAGE_DIR}")
execute_process(COMMAND
${CMAKE_COMMAND} -E remove_directory
"${CMAKE_INSTALL_PREFIX}/${PKG_STAGE_DIR}"
RESULT_VARIABLE cleanup_stagedir_rv
OUTPUT_VARIABLE cleanup_stagedir_ov
ERROR_VARIABLE cleanup_stagedir_ov
)
if(cleanup_stagedir_rv)
message(FATAL_ERROR "Delete ${CMAKE_INSTALL_PREFIX}/${PKG_STAGE_DIR} - FAILED\ncleanup_stagedir_ov=${cleanup_stagedir_ov}")
message(FATAL_ERROR "Delete ${CMAKE_INSTALL_PREFIX}/${PKG_STAGE_DIR} - FAILED\ncleanup_stagedir_ov=${cleanup_stagedir_ov}")
else()
message(STATUS "Delete ${CMAKE_INSTALL_PREFIX}/${PKG_STAGE_DIR} - OK")
message(STATUS "Delete ${CMAKE_INSTALL_PREFIX}/${PKG_STAGE_DIR} - OK")
endif()
endif()
if(EXISTS "${PACKAGE_OUTPUT_FILE}")
message(STATUS "Remove PACKAGE_OUTPUT_FILE: ${PACKAGE_OUTPUT_FILE}")
execute_process(COMMAND
${CMAKE_COMMAND} -E remove -f "${PACKAGE_OUTPUT_FILE}"
RESULT_VARIABLE cleanup_pkgfile_rv
OUTPUT_VARIABLE cleanup_pkgfile_ov
ERROR_VARIABLE cleanup_pkgfile_ov
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
message(STATUS "Remove PACKAGE_OUTPUT_FILE: ${PACKAGE_OUTPUT_FILE}")
execute_process(COMMAND
${CMAKE_COMMAND} -E remove -f "${PACKAGE_OUTPUT_FILE}"
RESULT_VARIABLE cleanup_pkgfile_rv
OUTPUT_VARIABLE cleanup_pkgfile_ov
ERROR_VARIABLE cleanup_pkgfile_ov
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
if(cleanup_pkgfile_rv)
message(FATAL_ERROR "Delete ${PACKAGE_OUTPUT_FILE} - FAILED\ncleanup_pkgfile_ov=${cleanup_pkgfile_ov}")
if(cleanup_pkgfile_rv)
message(FATAL_ERROR "Delete ${PACKAGE_OUTPUT_FILE} - FAILED\ncleanup_pkgfile_ov=${cleanup_pkgfile_ov}")
else()
message(STATUS "Delete ${PACKAGE_OUTPUT_FILE} - OK")
message(STATUS "Delete ${PACKAGE_OUTPUT_FILE} - OK")
endif()
endif()
......
......@@ -51,7 +51,7 @@ function(install_rule src_file)
# like MosiacHeaderTest1.exe. This ideally should be
# fixed in remote modules like OTBMosiacHeaderTest1.exe
if(PKG_DEBUG)
message("SKIP INSTALL for ${sfile_NAME_LOWER}")
message("SKIP INSTALL for ${sfile_NAME_LOWER}")
endif()
continue()
elseif(("${sfile_ABS_LOWER}" MATCHES "(\\${LIB_EXT})$") AND (src_file_GNAME STREQUAL "plugins"))
......@@ -109,11 +109,11 @@ function(install_rule src_file)
# This check comes outside the first if-elseif ladder
# because no matter what extension of file type, otbapp_* must go
# into lib/otb/applications
if("${sfile_NAME_LOWER}" MATCHES "^otbapp_")
install_otbapp_wrapper_scripts(${sfile_NAME})
set(install_dir "lib/otb/applications")
set(install_type PROGRAMS)
endif()
if("${sfile_NAME_LOWER}" MATCHES "^otbapp_")
install_otbapp_wrapper_scripts(${sfile_NAME})
set(install_dir "lib/otb/applications")
set(install_type PROGRAMS)
endif()
if(NOT install_type OR NOT install_dir)
#throw fatal error and return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment