Merge pull request #9 from nodtem66/dev

Dev
nodtem66 · Mar 14, 2020 · 040c9cb · 040c9cb
2 parents c6e2a88 + d1472ff
commit 040c9cb
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,6 +12,8 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 option(LIBIGL_WITH_OPENGL            "Use OpenGL"         OFF)
 option(LIBIGL_WITH_OPENGL_GLFW       "Use GLFW"           OFF)
 
+message(STATUS "PROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR}")
+
 find_package(LIBIGL REQUIRED)
 find_package(TBB REQUIRED)
 find_package(VCG REQUIRED)
@@ -49,4 +51,4 @@ target_include_directories(SliceTest PRIVATE "${PROJECT_SOURCE_DIR}/include" ${T
 target_link_libraries(SliceTest PRIVATE igl::core tbb_static)
 
 add_executable(Fixer ${MAIN_SOURCES} ${PROJECT_SOURCE_DIR}/src/FixSelfIntersect.cpp ${VCG_INCLUDE_DIR}/wrap/ply/plylib.cpp)
-target_include_directories(Fixer PRIVATE "${PROJECT_SOURCE_DIR}/include" ${VCG_INCLUDE_DIR})
+target_include_directories(Fixer PRIVATE "${PROJECT_SOURCE_DIR}/include" ${VCG_INCLUDE_DIR})
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Scaffolder 
-[![Build Status](https://travis-ci.org/nodtem66/Scaffolder.svg?branch=master)](https://travis-ci.org/nodtem66/Scaffolder) [![Build Status](https://travis-ci.org/nodtem66/Scaffolder.svg?branch=dev)](https://travis-ci.org/nodtem66/Scaffolder)
+[![Build Status](https://travis-ci.org/nodtem66/Scaffolder.svg?branch=master)](https://travis-ci.org/nodtem66/Scaffolder) [![Build Status](https://travis-ci.org/nodtem66/Scaffolder.svg?branch=dev)](https://travis-ci.org/nodtem66/Scaffolder) 
 Generate scaffold from STL file with implicit function (Schwarz P/ Gyroid).
 ```
 Scaffolder - generate 3D scaffold from STL file

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -31,6 +31,8 @@ strategy:
 pool:
   vmImage: $(vmImage)
 steps:
+- checkout: self
+  submodules: true
 - task: CMake@1
   inputs:
     cmakeArgs: .. -DCMAKE_CXX_STANDARD=$(build_std) -DCMAKE_BUILD_TYPE=$(build_type)

diff --git a/cmake/FindDIPlib.cmake b/cmake/FindDIPlib.cmake
@@ -12,8 +12,11 @@ find_path(DIPlib_INCLUDE_DIR diplib.h
         ${DIPlib_DIR}
         ENV DIPlib_DIR
     PATHS
-        ${CMAKE_SOURCE_DIR}/external/diplib    
+         ${PROJECT_SOURCE_DIR}/external/diplib
+         ${PROJECT_SOURCE_DIR}/../external/diplib
+         ${PROJECT_SOURCE_DIR}/../../external/diplib
     PATH_SUFFIXES include
+    NO_DEFAULT_PATH
 )
 # TODO: Rewrite this cmake to add the source without compiled lib
 set(DIPlib_LIB_DIR ${DIPlib_INCLUDE_DIR}/../lib)

diff --git a/cmake/FindLIBIGL.cmake b/cmake/FindLIBIGL.cmake
@@ -11,8 +11,11 @@ find_path(LIBIGL_INCLUDE_DIR igl/readOBJ.h
         ${LIBIGL_DIR}
         ENV LIBIGL_DIR
     PATHS
-        ${CMAKE_SOURCE_DIR}/external/libigl
+        ${PROJECT_SOURCE_DIR}/external/libigl
+        ${PROJECT_SOURCE_DIR}/../external/libigl
+        ${PROJECT_SOURCE_DIR}/../../external/libigl
     PATH_SUFFIXES include
+    NO_DEFAULT_PATH
 )
 
 include(FindPackageHandleStandardArgs)

diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
@@ -12,8 +12,11 @@ find_path(TBB_INCLUDE_DIR tbb/tbb.h
         ${TBB_DIR}
         ENV TBB_DIR
     PATHS
-        ${CMAKE_SOURCE_DIR}/external/tbb    
+        ${PROJECT_SOURCE_DIR}/external/tbb
+        ${PROJECT_SOURCE_DIR}/../external/tbb
+        ${PROJECT_SOURCE_DIR}/../../external/tbb
     PATH_SUFFIXES include
+    NO_DEFAULT_PATH
 )
 set(TBB_ROOT_DIR ${TBB_INCLUDE_DIR}/../)
 

diff --git a/cmake/FindVCG.cmake b/cmake/FindVCG.cmake
@@ -12,8 +12,11 @@ find_path(VCG_INCLUDE_DIR vcg/complex/base.h
         ${VCG_DIR}
         ENV VCG_DIR
     PATHS
-        ${CMAKE_SOURCE_DIR}/external/vcglib
+        ${PROJECT_SOURCE_DIR}/external/vcglib
+        ${PROJECT_SOURCE_DIR}/../external/vcglib
+        ${PROJECT_SOURCE_DIR}/../../external/vcglib
     PATH_SUFFIXES include
+    NO_DEFAULT_PATH
 )
 
 include(FindPackageHandleStandardArgs)