Skip to content

Commit c16d0e8

Browse files
committed
Made CMake setup work on linux (RH6)
1 parent a5f1a51 commit c16d0e8

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.2.0 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 2.8.12 )
22

33
project (SolveSpaceLib)
44

libslvs/CMakeLists.txt

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
cmake_minimum_required(VERSION 3.2.0 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
# Platform utilities
44

5-
if(WIN32)
5+
if(MSVC)
66
add_definitions(-D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS)
77
endif()
88

@@ -35,6 +35,11 @@ add_library(libslvs ${SLVS_LIB_TYPE}
3535
include/SolveSpaceSystem.h
3636
SolveSpaceSystem.cpp)
3737

38+
if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
39+
target_compile_options(libslvs
40+
PRIVATE -Wno-missing-field-initializers
41+
PUBLIC -std=c++11)
42+
endif()
3843

3944
target_compile_definitions(libslvs
4045
PUBLIC ${SLVS_SHARED_LIB_DEFINE}

0 commit comments

Comments
 (0)