commit db8b3f16fa0c2112d115813f9aa7433edb8f3e6a parent cd62e62b717d67d30c7a5ebea84e4fb254d327d1 Author: Vincent Forest <vincent.forest@meso-star.com> Date: Fri, 27 Mar 2015 16:21:39 +0100 Change the filename of the Star3D cmake config files Diffstat:
| M | cmake/CMakeLists.txt | | | 12 | ++++++------ |
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt @@ -29,9 +29,8 @@ # The fact that you are presently reading this means that you have had # knowledge of the CeCILL license and that you accept its terms. -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8) project(star-3d C CXX) -cmake_policy(SET CMP0011 NEW) enable_testing() set(S3D_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../src) @@ -50,7 +49,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${RCMAKE_SOURCE_DIR}) include(rcmake) if(CMAKE_COMPILER_IS_GNUCXX) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-long-long") endif() include_directories(${Embree_INCLUDE_DIR} ${RSys_INCLUDE_DIR}) @@ -93,11 +91,13 @@ set_target_properties(s3d PROPERTIES SOVERSION ${VERSION_MAJOR}) if(CMAKE_COMPILER_IS_GNUCXX) - # Shut up the use of variadic macros by Embree - set_target_properties(s3d PROPERTIES COMPILE_FLAGS "-Wno-variadic-macros") + # Shut up the use of variadic macros by Embree and the use of long long + # constants by RSys + set_target_properties(s3d PROPERTIES + COMPILE_FLAGS "-Wno-variadic-macros -Wno-long-long") endif() -rcmake_setup_devel(s3d s3d ${VERSION} se/s3d_version.h) +rcmake_setup_devel(s3d Star3D ${VERSION} se/s3d_version.h) ################################################################################ # Add tests