commit e5e7d7e0a5bf7c66750e359ed7d1074c5587c74b
parent c7a8d7c5ff73b8879c3316cc092c4824d59b4e6e
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Thu, 28 Apr 2016 17:18:47 +0200
Update the install directory of the documentation
Diffstat:
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ function.
## How to build
-The *Star-MC* library relies on the [CMake](http://www.cmake.org) and the
+The Star-MC library relies on the [CMake](http://www.cmake.org) and the
[RCMake](https://gitlab.com/vaplv/rcmake/) package to build. It also depends on
the [RSys](https://gitlab.com/vaplv/rsys/) and the
[Star-Sampling](https://gitlab.com/meso-star/star-sp/) libraries.
@@ -13,12 +13,12 @@ the [RSys](https://gitlab.com/vaplv/rsys/) and the
First ensure that CMake is installed on your system. Then install the RCMake
package as well as the RSys and the Star-Sampling libraries. Finally generate
the project from the `cmake/CMakeLists.txt` file by appending to the
-`CMAKE_PREFIX_PATH` variable the `<RCMAKE_INSTALL_DIR>/lib/cmake`,
-`<RSYS_INSTALL_DIR>` and `<SSP_INSTALL_DIR>` directories, where
-`<RCMAKE_INSTALL_DIR>`, `<RSYS_INSTALL_DIR>` and `<SSP_INSTALL_DIR>` are the
-install directories of the RCMake package, the RSys and the Star-Sampling
-libraries, respectively. The generated project can be edited, built, tested and
-installed as any CMake project.
+`CMAKE_PREFIX_PATH` variable the `<RCMAKE_INSTALL_DIR>`, `<RSYS_INSTALL_DIR>`
+and `<SSP_INSTALL_DIR>` directories, where `<RCMAKE_INSTALL_DIR>`,
+`<RSYS_INSTALL_DIR>` and `<SSP_INSTALL_DIR>` are the install directories of the
+RCMake package, the RSys and the Star-Sampling libraries, respectively. The
+generated project can be edited, built, tested and installed as any CMake
+project.
## License
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -39,7 +39,7 @@ option(NO_TEST "Disable the test" OFF)
################################################################################
# Check dependencies
################################################################################
-find_package(RCMake 0.1 REQUIRED)
+find_package(RCMake 0.2.2 REQUIRED)
find_package(RSys 0.2 REQUIRED)
find_package(StarSP 0.1 REQUIRED)
find_package(Star3D 0.3)
@@ -136,8 +136,7 @@ if(NOT NO_TEST)
new_test(test_smc_light_path)
rcmake_copy_runtime_libraries(test_smc_light_path)
target_link_libraries(test_smc_light_path Star3D)
- set_target_properties(test_smc_light_path PROPERTIES
- INCLUDE_DIRECTORIES ${Star3D_INCLUDE_DIR})
+ include_directories(${Star3D_INCLUDE_DIR})
endif()
endif()
@@ -150,5 +149,5 @@ install(TARGETS smc
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin)
install(FILES ${SMC_FILES_INC_API} DESTINATION include/star)
-install(FILES ${SMC_FILES_DOC} DESTINATION doc/star-mc)
+install(FILES ${SMC_FILES_DOC} DESTINATION share/doc/star-mc)
