Skip to content

Commit 28c801f

Browse files
committed
debugging windows...
1 parent 5450272 commit 28c801f

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

.appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ branches:
77
only:
88
- master
99
environment:
10-
# APPVEYOR_RDP_PASSWORD: pypAss126.
10+
APPVEYOR_RDP_PASSWORD: pypAss126.
1111
matrix:
1212
- config: Release
1313
PYTHON: "C:\\Python36-x64"
@@ -20,8 +20,8 @@ install:
2020
- "python -m pip install numpy"
2121
- "python -m pip install scipy"
2222
- "python -c \"import numpy as np;import sys;print(np.get_include())\""
23-
# init:
24-
# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
23+
init:
24+
- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
2525
# on_finish:
2626
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
2727
build:

CMakeLists.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ include(UseColors)
1313
#WArning this is horrible but is needed to avoid a typo in Pybind11...
1414
SET(CMAKE_HOST_WIN32 OFF)
1515

16+
include(PyiglDependencies)
17+
18+
# NumpyEigen
19+
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LIBIGL_EXTERNAL}/numpyeigen/cmake)
20+
# Generate position independent code by default
21+
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
22+
include(numpyeigen)
23+
1624

1725
# Extra warnings
1826
include(Warnings)
@@ -24,24 +32,6 @@ include(CXXFeatures)
2432
# Sort projects inside the solution
2533
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
2634

27-
# Generate position independent code by default
28-
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
29-
30-
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
31-
foreach(config ${CMAKE_CONFIGURATION_TYPES})
32-
string(TOUPPER ${config} config)
33-
string(REPLACE /MD /MT CMAKE_C_FLAGS_${config} "${CMAKE_C_FLAGS_${config}}")
34-
string(REPLACE /MD /MT CMAKE_CXX_FLAGS_${config} "${CMAKE_CXX_FLAGS_${config}}")
35-
endforeach()
36-
endif()
37-
38-
include(PyiglDependencies)
39-
40-
# NumpyEigen
41-
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LIBIGL_EXTERNAL}/numpyeigen/cmake)
42-
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
43-
include(numpyeigen)
44-
4535

4636
# LibIGL
4737
option(LIBIGL_USE_STATIC_LIBRARY "Use libigl as static library" OFF)
@@ -94,6 +84,16 @@ target_include_directories(pyigl PRIVATE "src/include")
9484
# set_target_properties(pyigl PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/igl")
9585

9686

87+
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
88+
foreach(config ${CMAKE_CONFIGURATION_TYPES})
89+
string(TOUPPER ${config} config)
90+
string(REPLACE /MD /MT CMAKE_C_FLAGS_${config} "${CMAKE_C_FLAGS_${config}}")
91+
string(REPLACE /MD /MT CMAKE_CXX_FLAGS_${config} "${CMAKE_CXX_FLAGS_${config}}")
92+
endforeach()
93+
endif()
94+
95+
96+
9797
if(${LIBIGL_PYTHON_TESTS})
9898
enable_testing()
9999
add_subdirectory(tests)

0 commit comments

Comments
 (0)