Skip to content

Commit

Permalink
OCCT7.5.3 platform parameter fix (#75)
Browse files Browse the repository at this point in the history
* Delete .meta.yaml.swp

* recipe cleanup

* Use build number

* Use ubuntu 18.04

* Cleanup

* Specify correct platform
  • Loading branch information
adam-urbanczyk authored Jan 17, 2022
1 parent e9053e5 commit 257c90a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
6 changes: 5 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,12 @@ message( STATUS "${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}")

if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
set(WIN_PREFIX /Library)
set(PLATFORM Windows)
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
set(CXX_INCLUDES -i $ENV{CONDA_PREFIX}/include/c++/v1/ )
set(PLATFORM OSX)
else()
set(PLATFORM Linux)
endif()

set(ENV{PYTHONPATH} ${CMAKE_SOURCE_DIR}/pywrap )
Expand All @@ -28,7 +32,7 @@ if( NOT EXISTS ${CMAKE_SOURCE_DIR}/OCP )
-i $ENV{CONDA_PREFIX}${WIN_PREFIX}/include/vtk-${VTK_VERSION_MAJOR}.${VTK_VERSION_MINOR}/
-i $ENV{CONDA_PREFIX}${WIN_PREFIX}/lib/clang/${LLVM_VERSION}/include/
${CXX_INCLUDES}
all ocp.toml Linux
all ocp.toml ${PLATFORM}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND_ECHO STDOUT
)
Expand Down
5 changes: 4 additions & 1 deletion conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ source:
path: ..

build:
number: 2
number: 3
script:
{% if not os.path.exists('build') %}
- cmake -B build -S . -G Ninja -DCMAKE_BUILD_TYPE=Release
Expand Down Expand Up @@ -48,6 +48,9 @@ requirements:
test:
imports:
- OCP
- OCP.WNT # [win]
- OCP.Xw # [linux]
- OCP.Cocoa # [osx]

about:
summary: Python wrapper for OCCT

0 comments on commit 257c90a

Please sign in to comment.