commit 051edceedef0ea76b70263dc9c65a57cd59693b7
parent b6e3b27e380c410ee0552f8aa1c7a3ac97707fff
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Thu, 28 Apr 2016 17:05:34 +0200
Update the RCMake dependency to 0.2.2
Diffstat:
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
@@ -32,6 +32,7 @@ electromagnetism. Please refer to these projects for informations on their
purpose.
* [Star-Display](https://gitlab.com/meso-star/star-display.git)
+ * [Star-GebhartFactor](https://gitlab.com/meso-star/star-gf.git)
* [Star-Schiff](https://gitlab.com/meso-star/star-schiff.git)
## Install
@@ -53,7 +54,7 @@ install the [RCMake](https://gitlab.com/vaplv/rcmake.git) package as well as
the [RSys](https://gitlab.com/vaplv/rsys.git) and
[Embree](https://embree.github.io) libraries. Finally generate the project from
the `cmake/CMakeLists.txt` file by appending to the `CMAKE_PREFIX_PATH`
-variable the `<RCMAKE_DIR>/lib/cmake`, `<RSYS_DIR>` and `<EMBREE_DIR>`
+variable the `<RCMAKE_DIR>`, `<RSYS_DIR>` and `<EMBREE_DIR>`
directories, where `<RCMAKE_DIR>`, `<RSYS_DIR>` and `<EMBREE_DIR`> are the
install directories of the RCMake package, the RSys and the Embree libraries,
respectively. The resulting project can be edited, built, tested and installed
@@ -66,7 +67,7 @@ Example on a GNU/Linux system:
~ $ git clone https://gitlab.com/meso-star/star-3d.git
~ $ mkdir star-3d/build && cd star-3d/build
~/star-3d/build $ cmake -G "Unix Makefiles" \
- > -DCMAKE_PREFIX_PATH="<RCMAKE_DIR>/lib/cmake;<RSYS_DIR>;<EMBREE_DIR>" \
+ > -DCMAKE_PREFIX_PATH="<RCMAKE_DIR>;<RSYS_DIR>;<EMBREE_DIR>" \
> -DCMAKE_INSTALL_PREFIX=<STAR3D_INSTALL_DIR> \
> ../cmake
~/star-3d/build $ make && make test
@@ -105,9 +106,7 @@ Star-3D package to build an executable relying on the Star-3D library.
This `CMakeLists.txt` is then used to generate the target project as, for
instance, on a GNU/Linux system:
- cmake -G "Unix Makefiles" \
- > -DCMAKE_PREFIX_PATH="<STAR3D_INSTALL_DIR>/lib/cmake;<STAR3D_INSTALL_DIR>" \
- > <MY_PROJECT_DIR>
+ cmake -G "Unix Makefiles" -DCMAKE_PREFIX_PATH="<STAR3D_INSTALL_DIR>" <MY_PROJECT_DIR>
with `<STAR3D_INSTALL_DIR>` the install directory of Star-3D and
`<MY_PROJECT_DIR>` the location of the `CMakeLists.txt` file.
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -43,7 +43,7 @@ get_filename_component(_current_source_dir ${CMAKE_CURRENT_LIST_FILE} PATH)
set(Embree_DIR ${_current_source_dir}/)
find_package(Embree REQUIRED)
-find_package(RCMake 0.2 REQUIRED)
+find_package(RCMake 0.2.2 REQUIRED)
find_package(RSys 0.2.1 REQUIRED)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${RCMAKE_SOURCE_DIR})
include(rcmake)
