Skip to content

Commit 0afbe7f

Browse files
committed
Removed cannonball demo and made dummy work
1 parent bca268c commit 0afbe7f

File tree

6 files changed

+44
-388
lines changed

6 files changed

+44
-388
lines changed

cmake/FindLIBIGL.cmake

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# - Try to find the LIBIGL library
2+
# Once done this will define
3+
#
4+
# LIBIGL_FOUND - system has LIBIGL
5+
# LIBIGL_INCLUDE_DIR - **the** LIBIGL include directory
6+
if(LIBIGL_FOUND)
7+
return()
8+
endif()
9+
10+
find_path(LIBIGL_INCLUDE_DIR igl/readOBJ.h
11+
HINTS
12+
ENV LIBIGL
13+
ENV LIBIGLROOT
14+
ENV LIBIGL_ROOT
15+
ENV LIBIGL_DIR
16+
PATHS
17+
${CMAKE_SOURCE_DIR}/../..
18+
${CMAKE_SOURCE_DIR}/..
19+
${CMAKE_SOURCE_DIR}
20+
${CMAKE_SOURCE_DIR}/libigl
21+
${CMAKE_SOURCE_DIR}/../libigl
22+
${CMAKE_SOURCE_DIR}/../../libigl
23+
${CMAKE_SOURCE_DIR}/../../lib/libigl
24+
${CMAKE_SOURCE_DIR}/lib/libigl
25+
${CMAKE_SOURCE_DIR}/../lib/libigl
26+
/usr
27+
/usr/local
28+
/usr/local/igl/libigl
29+
PATH_SUFFIXES include
30+
)
31+
message(${LIBIGL_INCLUDE_DIR})
32+
include(FindPackageHandleStandardArgs)
33+
find_package_handle_standard_args(LIBIGL
34+
"\nlibigl not found --- You can download it using:\n\tgit clone --recursive https://github.com/libigl/libigl.git ${CMAKE_SOURCE_DIR}/../libigl"
35+
LIBIGL_INCLUDE_DIR)
36+
mark_as_advanced(LIBIGL_INCLUDE_DIR)
37+
38+
list(APPEND CMAKE_MODULE_PATH "${LIBIGL_INCLUDE_DIR}/../cmake")
39+
message(${CMAKE_MODULE_PATH})
40+
include(libigl)

demos/0_dummy/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
cmake_minimum_required(VERSION 3.1)
33
project(0_dummy)
44

5-
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
5+
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake)
66
set(CMAKE_CXX_FLAGS "-Wall")
77

88
# libigl
@@ -31,11 +31,11 @@ endif()
3131

3232
# Add your project files
3333
file(GLOB SRCFILES *.cpp)
34-
file(GLOB SRC_FILES ${PROJECT_SOURCE_DIR}/../include/*.cpp)
34+
file(GLOB SRC_FILES ${PROJECT_SOURCE_DIR}/../../include/*.cpp)
3535
file(GLOB HFILES *.h)
36-
file(GLOB H_FILES ${PROJECT_SOURCE_DIR}/../include/*.h)
36+
file(GLOB H_FILES ${PROJECT_SOURCE_DIR}/../../include/*.h)
3737

38-
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../include)
38+
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../include)
3939

4040
add_definitions(-DIGL_VIEWER_VIEWER_QUIET)
4141
add_executable(${PROJECT_NAME} ${SRCFILES} ${SRC_FILES} ${HFILES} ${H_FILES})

demos/1_cannonball/CMakeLists.txt

-42
This file was deleted.

demos/1_cannonball/CannonBallSim.cpp

-72
This file was deleted.

demos/1_cannonball/CannonBallSim.h

-152
This file was deleted.

0 commit comments

Comments
 (0)