From d2138765fd9c1e6801dc0a169e63b322b0645c94 Mon Sep 17 00:00:00 2001
From: Marco Biasini <marco.biasini@unibas.ch>
Date: Wed, 25 Jul 2012 17:23:36 +0200
Subject: [PATCH] reuse same target for staging headers
---
cmake_support/OST.cmake | 11 +++++------
scripts/CMakeLists.txt | 2 +-
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/cmake_support/OST.cmake b/cmake_support/OST.cmake
index 7b593f23a..c6f9356f1 100644
--- a/cmake_support/OST.cmake
+++ b/cmake_support/OST.cmake
@@ -115,14 +115,14 @@ macro(stage_headers HEADERS HEADER_INSTALL_DIR TARGET SUB)
if (NOT _SUB)
set(_TARGET_NAME ${_TARGET}_headers)
endif()
- add_custom_target("${_TARGET_NAME}" COMMENT "")
+ if (NOT TARGET headers)
+ add_custom_target("headers" COMMENT "")
+ endif()
set(HEADER_DIR "${HEADER_STAGE_PATH}/${HEADER_INSTALL_DIR}")
copy_if_different("" "${HEADER_DIR}"
"${_ABS_HEADER_NAMES}" ""
- "${_TARGET_NAME}")
- add_dependencies("${TARGET}" "${_TARGET_NAME}")
- set_target_properties("${_TARGET_NAME}" PROPERTIES
- EchoString "Staging headers ${TARGET}")
+ "${TARGET}")
+ add_dependencies(${TARGET} "headers")
endmacro()
#-------------------------------------------------------------------------------
@@ -583,7 +583,6 @@ macro(pymod)
set(_ABS_PY_FILES)
set(_PY_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${_DIR}")
foreach(_PY ${_PY_FILES})
- MESSAGE("${_DIR}:${_PY}")
list(APPEND _ABS_PY_FILES "${_PY_SOURCE_DIR}/${_PY}")
endforeach()
install(FILES ${_ABS_PY_FILES} DESTINATION
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index bdf0e613a..12b81a310 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -37,7 +37,7 @@ if (NOT ENABLE_STATIC)
if (ENABLE_GUI)
list(APPEND INIT_SCRIPTS init.py)
endif()
- copy_if_different("${CMAKE_CURRENT_SOURCE_DIR}" "${STAGE_DIR}/${LIB_DIR}/openstructure"
+ copy_if_different("${CMAKE_CURRENT_SOURCE_DIR}" "${STAGE_DIR}/${SPD}"
"${INIT_SCRIPTS}" "python init scripts" ost_scripts)
install(FILES ${INIT_SCRIPTS} DESTINATION "${SPD}")
--
GitLab