Zorba

Merge lp:~zorba-coders/zorba/fix-core-install into lp:zorba

  1. fix-core-install
  2. Merge into trunk
Proposed by Chris Hillery
Status: Merged
Approved by: Matthias Brantner
Approved revision: 10569
Merged at revision: 10569
Proposed branch: lp:~zorba-coders/zorba/fix-core-install
Merge into: lp:zorba
Diff against target: 40 lines (+4/-6)
1 file modified
cmake_modules/ZorbaModule.cmake (+4/-6)
To merge this branch: bzr merge lp:~zorba-coders/zorba/fix-core-install
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Chris Hillery Approve
Review via email: mp+84179@code.launchpad.net

Commit message

Fix reversed URI installation directories.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix-core-install-2011-12-01T21-51-21.786Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job fix-core-install-2011-12-01T21-51-21.786Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake_modules/ZorbaModule.cmake'
2--- cmake_modules/ZorbaModule.cmake 2011-12-01 21:36:55 +0000
3+++ cmake_modules/ZorbaModule.cmake 2011-12-01 21:48:29 +0000
4@@ -272,12 +272,12 @@
5 IF(NOT ${PROJECT_NAME} STREQUAL "zorba")
6 STRING(REPLACE "-" "_" component_name ${PROJECT_NAME})
7 INSTALL(TARGETS ${module_lib_target}
8- ${target_type} DESTINATION ${ZORBA_CORE_LIB_DIR}/${module_path}
9+ ${target_type} DESTINATION ${ZORBA_NONCORE_LIB_DIR}/${module_path}
10 COMPONENT ${component_name})
11
12 ELSE(NOT ${PROJECT_NAME} STREQUAL "zorba")
13 INSTALL(TARGETS ${module_lib_target}
14- ${target_type} DESTINATION ${ZORBA_NONCORE_LIB_DIR}/${module_path})
15+ ${target_type} DESTINATION ${ZORBA_CORE_LIB_DIR}/${module_path})
16 ENDIF(NOT ${PROJECT_NAME} STREQUAL "zorba")
17 ENDIF (NOT MODULE_TEST_ONLY)
18
19@@ -427,7 +427,7 @@
20 IF(NOT _is_core)
21 STRING(REPLACE "-" "_" component_name ${PROJECT_NAME})
22 INSTALL (FILES "${INPUT_FILE}"
23- DESTINATION "${ZORBA_CORE_URI_DIR}/${_output_path}"
24+ DESTINATION "${ZORBA_NONCORE_URI_DIR}/${_output_path}"
25 RENAME "${_output_filename}"
26 COMPONENT "${component_name}")
27
28@@ -447,11 +447,9 @@
29
30 ELSE(NOT _is_core)
31 INSTALL (FILES "${INPUT_FILE}"
32- DESTINATION "${ZORBA_NONCORE_URI_DIR}/${_output_path}"
33+ DESTINATION "${ZORBA_CORE_URI_DIR}/${_output_path}"
34 RENAME "${_output_filename}")
35 ENDIF(NOT _is_core)
36-
37-
38
39 ENDIF (${_output_ext} STREQUAL ".xq" OR ${_output_ext} STREQUAL ".xsd")
40 ENDIF (NOT ${TEST_ONLY} EQUAL 1)

Subscribers

People subscribed via source and target branches