Skip to content

Commit 342e7b8

Browse files
authored
fixing THPP cmake for cmake < 3.1 (pytorch#559)
1 parent 00410c4 commit 342e7b8

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

torch/lib/THPP/CMakeLists.txt

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
1+
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
22
SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
33

44
################################################################################
@@ -18,6 +18,14 @@ FUNCTION(EXCLUDE_DIR list_name dir_name)
1818
ENDFUNCTION()
1919

2020
################################################################################
21+
22+
if(${CMAKE_VERSION} VERSION_LESS "2.8.12")
23+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
24+
else(${CMAKE_VERSION} VERSION_LESS "2.8.12")
25+
if(${CMAKE_VERSION} VERSION_LESS "3.1")
26+
add_compile_options(-std=c++11) # CMake 2.8.12 to 3.1
27+
endif(${CMAKE_VERSION} VERSION_LESS "3.1")
28+
endif(${CMAKE_VERSION} VERSION_LESS "2.8.12")
2129

2230
IF(NOT Torch_FOUND)
2331
FIND_PACKAGE(Torch REQUIRED)
@@ -40,9 +48,12 @@ EXCLUDE_DIR(all_cpp ".*/generic/.*\\.cpp$")
4048

4149
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
4250
ADD_LIBRARY(THPP SHARED ${all_cpp})
43-
SET_PROPERTY(TARGET THPP PROPERTY CXX_STANDARD 11)
4451
SET_TARGET_PROPERTIES(THPP PROPERTIES VERSION 1 SOVERSION 1)
4552

53+
if(NOT ${CMAKE_VERSION} VERSION_LESS "3.1")
54+
SET_PROPERTY(TARGET THPP PROPERTY CXX_STANDARD 11)
55+
endif(NOT ${CMAKE_VERSION} VERSION_LESS "3.1")
56+
4657
TARGET_LINK_LIBRARIES(THPP PRIVATE ${TH_LIBRARIES})
4758

4859
INSTALL(TARGETS THPP

0 commit comments

Comments
 (0)