From 257c90a912e9477d4f97004fc8bc4cdfa752993c Mon Sep 17 00:00:00 2001 From: AU Date: Mon, 17 Jan 2022 18:00:32 +0100 Subject: [PATCH] OCCT7.5.3 platform parameter fix (#75) * Delete .meta.yaml.swp * recipe cleanup * Use build number * Use ubuntu 18.04 * Cleanup * Specify correct platform --- CMakeLists.txt | 6 +++++- conda/meta.yaml | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f88a92f8..7a26cb21 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 ) @@ -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 ) diff --git a/conda/meta.yaml b/conda/meta.yaml index eb85b682..9f101460 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -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 @@ -48,6 +48,9 @@ requirements: test: imports: - OCP + - OCP.WNT # [win] + - OCP.Xw # [linux] + - OCP.Cocoa # [osx] about: summary: Python wrapper for OCCT