Ticket #10898 (closed: fixed)

Opened 6 years ago

Last modified 5 years ago

Add a CMakeLists.txt file at the root of the code

Reported by: Martyn Gigg Owned by: Martyn Gigg
Priority: major Milestone: Release 3.4
Component: Framework Keywords:
Cc: Blocked By:
Blocking: #10869 Tester: Harry Jeffery

Description

This is required in order to get ExternalData support working. It will also make it more transparent as to where you must point cmake.

Change History

comment:1 Changed 6 years ago by Martyn Gigg

  • Status changed from new to assigned

comment:2 Changed 6 years ago by Martyn Gigg

  • Status changed from assigned to inprogress

Add a top-level CMakeLists.txt file.

All references to PROJECT_SOURCE_DIR have been updated as this now points to a different directory. This was required as the ExternalData mechanism can only reference test files underneath a CMakeLists.txt file containing a project() call. Refs #10898

Changeset: 43529852f1f3a7cfb68ce0dd8497830b7492fdec

comment:3 Changed 6 years ago by Martyn Gigg

Enable testing in the top level CMakeLists

Ensures that a CTestTestfile.cmake is created in to root of the build directory. Refs #10898

Changeset: 2fd7f749db770e64f9ae2dc580caa29d42c5ddfd

comment:4 Changed 6 years ago by Martyn Gigg

Add a missing include directory to VatesAPI

This should have been required before... Refs #10898

Changeset: a5b946ef02a51792e851126dbdff582b28b0a462

comment:5 Changed 6 years ago by Martyn Gigg

Fix MantidPlot & Vates CMakeLists for new layout.

Fixes new binary root and include directories. Refs #10898

Changeset: 562282195271a9b679bfc930d2b4ccfc17f3fa4a

comment:6 Changed 6 years ago by Martyn Gigg

Fix doxygen paths taking into account new binary root

Refs #10898

Changeset: 786bb186b0e3bcb021ce3f79018b7c02e1215f4c

comment:7 Changed 6 years ago by Martyn Gigg

Fix MANTID_ROOT definition in properties file generation.

Refs #10898

Changeset: b9a54ae70a4d53968afbe698f23797bc803d5fc9

comment:8 Changed 6 years ago by Martyn Gigg

Fix path to xmlrunner in MantidPlot tests.

Refs #10898

Changeset: d7b7f358279d826dbb23c0c48a9ef40dd5a8dae0

comment:9 Changed 6 years ago by Martyn Gigg

Fix paths in Jenkins build scripts for new layout.

Refs #10898

Changeset: 19769cf5a134a9d2b712ddc1f7f0877d6b90a54d

comment:10 Changed 6 years ago by Martyn Gigg

Fix CMAKE_SOURCE_DIR usage

This now points two directories up from where it used to. Refs #10898

Changeset: 4d9583ea8179864a34c9aa7d6a11394ba008640e

comment:11 Changed 6 years ago by Martyn Gigg

Fix Windows install script for new build layout

Refs #10898

Changeset: 7d53b1d6fa0e6196c1c34f3a9546e3412971cfe0

comment:12 Changed 6 years ago by Martyn Gigg

  • Status changed from inprogress to verify
  • Resolution set to fixed

This is being verified as pull request #131.

comment:13 Changed 6 years ago by Martyn Gigg

Fix third party path for the Mac

Refs #10898

Changeset: a4b276d428359817e1de8493b82eb5b0b4a47af6

comment:14 Changed 6 years ago by Martyn Gigg

retest this please

comment:15 Changed 6 years ago by Martyn Gigg

retest this please

comment:16 Changed 6 years ago by Martyn Gigg

Fix path to docs vcx project file in build script

Refs #10898

Changeset: c5e864cf033aa442ce3732c7a2d03350627c0ea7

comment:17 Changed 6 years ago by Martyn Gigg

Adjust method of computing patch number.

Git describe failed with out of source builds on Windows but git log seems to have no trouble. Refs #10898

Changeset: 08d2273abff412d6c85ca32f2f062044d4598cf9

comment:18 Changed 6 years ago by Harry Jeffery

retest this please

comment:19 Changed 6 years ago by Harry Jeffery

There appears to be a conflict in Code/Mantid/Build/Jenkins/buildscript.

comment:20 Changed 6 years ago by Harry Jeffery

  • Status changed from verify to reopened
  • Resolution fixed deleted

comment:21 Changed 6 years ago by Martyn Gigg

This turned out not to be viable for the current build structure. Building the visual studio solution with some directory layouts will not work as the paths are too long. Another approach will be taken in http://trac.mantidproject.org/mantid/ticket/10869

comment:22 Changed 6 years ago by Martyn Gigg

  • Status changed from reopened to verify
  • Resolution set to wontfix

comment:23 Changed 6 years ago by Martyn Gigg

Add a top-level CMakeLists.txt file.

All references to PROJECT_SOURCE_DIR have been updated as this now points to a different directory. This was required as the ExternalData mechanism can only reference test files underneath a CMakeLists.txt file containing a project() call. Refs #10898

Changeset: 43529852f1f3a7cfb68ce0dd8497830b7492fdec

comment:24 Changed 6 years ago by Martyn Gigg

Enable testing in the top level CMakeLists

Ensures that a CTestTestfile.cmake is created in to root of the build directory. Refs #10898

Changeset: 2fd7f749db770e64f9ae2dc580caa29d42c5ddfd

comment:25 Changed 6 years ago by Martyn Gigg

Add a missing include directory to VatesAPI

This should have been required before... Refs #10898

Changeset: a5b946ef02a51792e851126dbdff582b28b0a462

comment:26 Changed 6 years ago by Martyn Gigg

Fix MantidPlot & Vates CMakeLists for new layout.

Fixes new binary root and include directories. Refs #10898

Changeset: 562282195271a9b679bfc930d2b4ccfc17f3fa4a

comment:27 Changed 6 years ago by Martyn Gigg

Fix doxygen paths taking into account new binary root

Refs #10898

Changeset: 786bb186b0e3bcb021ce3f79018b7c02e1215f4c

comment:28 Changed 6 years ago by Martyn Gigg

Fix MANTID_ROOT definition in properties file generation.

Refs #10898

Changeset: b9a54ae70a4d53968afbe698f23797bc803d5fc9

comment:29 Changed 6 years ago by Martyn Gigg

Fix path to xmlrunner in MantidPlot tests.

Refs #10898

Changeset: d7b7f358279d826dbb23c0c48a9ef40dd5a8dae0

comment:30 Changed 6 years ago by Martyn Gigg

Fix paths in Jenkins build scripts for new layout.

Refs #10898

Changeset: 19769cf5a134a9d2b712ddc1f7f0877d6b90a54d

comment:31 Changed 6 years ago by Martyn Gigg

Fix CMAKE_SOURCE_DIR usage

This now points two directories up from where it used to. Refs #10898

Changeset: 4d9583ea8179864a34c9aa7d6a11394ba008640e

comment:32 Changed 6 years ago by Martyn Gigg

Fix Windows install script for new build layout

Refs #10898

Changeset: 7d53b1d6fa0e6196c1c34f3a9546e3412971cfe0

comment:33 Changed 6 years ago by Martyn Gigg

Fix third party path for the Mac

Refs #10898

Changeset: a4b276d428359817e1de8493b82eb5b0b4a47af6

comment:34 Changed 6 years ago by Martyn Gigg

Fix path to docs vcx project file in build script

Refs #10898

Changeset: c5e864cf033aa442ce3732c7a2d03350627c0ea7

comment:35 Changed 6 years ago by Martyn Gigg

Allow build scripts to find the repository

It no longer assumes that it was cloned to the root of the workspace Refs #10898

Changeset: c8e56754bd5f86aadbdf665b316eb8c0eb20dda3

comment:36 Changed 6 years ago by Martyn Gigg

Merge branch 'master' into feature/10898_cmakelists_in_repo_root

Conflicts:

Code/Mantid/Build/Jenkins/buildscript

Refs #10898

Changeset: e44802534114a22356a5ecae6d12fd83b54b3440

comment:37 Changed 6 years ago by Martyn Gigg

Adjust method of computing patch number.

Git describe failed with out of source builds on Windows but git log seems to have no trouble. Refs #10898

Changeset: 08d2273abff412d6c85ca32f2f062044d4598cf9

comment:38 Changed 6 years ago by Harry Jeffery

  • Status changed from verify to verifying
  • Tester set to Harry Jeffery

comment:39 Changed 6 years ago by Harry Jeffery

  • Status changed from verifying to closed

Pull request has been closed and branch deleted from github. Passing the wontfix status.

comment:40 Changed 5 years ago by Nick Draper

  • Resolution changed from wontfix to fixed

Somehow these slipped through without a resolution. Set to Fixed.

comment:41 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 11737

Note: See TracTickets for help on using tickets.