Skip to content

Commit b28491b

Browse files
committed
Cleanup CMakeLists
1 parent e485085 commit b28491b

File tree

1 file changed

+10
-29
lines changed

1 file changed

+10
-29
lines changed

CMakeLists.txt

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,19 @@ endif(COMMAND cmake_policy)
99

1010
SET(EXECUTABLE_OUTPUT_PATH ".")
1111

12-
IF(WIN32) # Windows
13-
SET(ZED_INCLUDE_DIRS $ENV{ZED_INCLUDE_DIRS})
14-
SET(ZED_LIBRARIES $ENV{ZED_LIBRARIES_64})
15-
SET(ZED_LIBRARY_DIR $ENV{ZED_LIBRARY_DIR})
16-
SET(GLUT_INCLUDE_DIRS $ENV{GLUT_INCLUDE_DIRS})
17-
SET(GLUT_LIBRARY_DIRS $ENV{GLUT_LIBRARY_DIRS})
18-
SET(GLUT_LIBRARY $ENV{GLUT_LIBRARY})
19-
SET(GLEW_INCLUDE_DIRS $ENV{GLEW_INCLUDE_DIRS})
20-
SET(GLEW_LIBRARY_DIRS $ENV{GLEW_LIBRARY_DIRS})
21-
SET(GLEW_LIBRARY $ENV{GLEW_LIBRARY})
22-
ELSE() # Linux
23-
find_package(ZED 2 REQUIRED)
24-
find_package(GLUT REQUIRED)
25-
find_package(GLEW REQUIRED)
26-
find_package(OpenPose REQUIRED)
27-
28-
exec_program(uname ARGS -p OUTPUT_VARIABLE CMAKE_SYSTEM_NAME2)
29-
if ( CMAKE_SYSTEM_NAME2 MATCHES "aarch64" )
30-
link_directories("/usr/lib/aarch64-linux-gnu/tegra") ## on Jetson TX1 64bits, the correct libGL.so is located here (the default one will lead to linking error (undef ref))
31-
unset(CUDA_USE_STATIC_CUDA_RUNTIME CACHE)
32-
option(CUDA_USE_STATIC_CUDA_RUNTIME OFF)
33-
message ("CUDA_USE_STATIC_CUDA_RUNTIME : ${CUDA_USE_STATIC_CUDA_RUNTIME}")
34-
endif()
35-
36-
SET(SPECIAL_OS_LIBS "pthread" "X11")
37-
add_definitions(-std=c++0x -g -O3 -pthread)
38-
ENDIF(WIN32)
39-
12+
find_package(ZED 2 REQUIRED)
13+
find_package(GLUT REQUIRED)
14+
find_package(GLEW REQUIRED)
15+
find_package(OpenGL REQUIRED)
4016
find_package(CUDA REQUIRED)
41-
find_package(OpenGL)
17+
find_package(OpenPose REQUIRED)
4218
find_package(OpenCV REQUIRED)
4319

20+
IF(NOT WIN32)
21+
SET(SPECIAL_OS_LIBS "pthread" "X11")
22+
add_definitions(-std=c++11 -Wno-write-strings -O3)
23+
ENDIF()
24+
4425
include_directories(${ZED_INCLUDE_DIRS})
4526
include_directories(${GLEW_INCLUDE_DIRS})
4627
include_directories(${GLUT_INCLUDE_DIRS})

0 commit comments

Comments
 (0)