Procházet zdrojové kódy

Try to make Travis/AppVeyor happy.

Jérémie Dumas před 6 roky
rodič
revize
b580234968
3 změnil soubory, kde provedl 8 přidání a 13 odebrání
  1. 0 3
      CMakeLists.txt
  2. 3 4
      cmake/libigl.cmake
  3. 5 6
      python/CMakeLists.txt

+ 0 - 3
CMakeLists.txt

@@ -40,9 +40,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 ### conditionally compile certain modules depending on libraries found on the system
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
 
-### Set compiler flags for building the tests on Windows with Visual Studio
-include(LibiglWindows)
-
 ### Adding libIGL: choose the path to your local copy libIGL
 include(libigl)
 

+ 3 - 4
cmake/libigl.cmake

@@ -78,11 +78,11 @@ target_compile_features(igl_common INTERFACE ${CXX11_FEATURES})
 if(MSVC)
   # Enable parallel compilation for Visual Studio
   target_compile_options(igl_common INTERFACE /MP /bigobj)
-  if(LIBIGL_WITH_CGAL)
-    target_compile_options(igl_common INTERFACE "/MD$<$<CONFIG:Debug>:d>")
-  endif()
 endif()
 
+### Set compiler flags for building the tests on Windows with Visual Studio
+include(LibiglWindows)
+
 if(BUILD_SHARED_LIBS)
   # Generate position independent code
   set_target_properties(igl_common PROPERTIES INTERFACE_POSITION_INDEPENDENT_CODE ON)
@@ -286,7 +286,6 @@ if(LIBIGL_WITH_EMBREE)
   target_link_libraries(igl_embree ${IGL_SCOPE} embree)
   target_include_directories(igl_embree ${IGL_SCOPE} ${EMBREE_DIR}/include)
   target_compile_definitions(igl_embree ${IGL_SCOPE} -DEMBREE_STATIC_LIB)
-
 endif()
 
 ################################################################################

+ 5 - 6
python/CMakeLists.txt

@@ -13,6 +13,11 @@ set(Python_ADDITIONAL_VERSIONS 3.4 3.5 3.6)
 find_package(PythonInterp REQUIRED)
 find_package(PythonLibs REQUIRED)
 
+## libigl
+if(NOT TARGET igl::core)
+  list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/../cmake")
+  include(libigl)
+endif()
 
 string(TOUPPER "${CMAKE_BUILD_TYPE}" U_CMAKE_BUILD_TYPE)
 if(UNIX)
@@ -23,12 +28,6 @@ if(UNIX)
   endif()
 endif()
 
-## libigl		
-if(NOT TARGET igl::core)		
-  list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/../cmake")		
-  include(libigl)		
-endif()
-
 ## include pybind
 set(PYBIND11_DIR ${PROJECT_SOURCE_DIR}/../external/pybind11 CACHE PATH "Path to pybind11")
 add_subdirectory(${PYBIND11_DIR} pybind11)