Skip to content

Commit

Permalink
build: remove last vestiges from partioSe
Browse files Browse the repository at this point in the history
  • Loading branch information
davvid committed Jun 25, 2019
1 parent bdecf26 commit f948507
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 19 deletions.
11 changes: 0 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ SET( CMAKE_SKIP_RPATH TRUE )
## project name & version
PROJECT(partio LANGUAGES CXX VERSION 1.5.2)

# PARTIO_SE_ENABLED enables SeExpr support
option(PARTIO_SE_ENABLED "PARTIO_SE_ENABLED" false)
option(GTEST_ENABLED "Enable GTest for tests" false)

# Enable C++11
Expand Down Expand Up @@ -108,15 +106,6 @@ option(BUILD_SHARED_LIBS "Enabled shared libraries" ON)
# Setup environment variable to link partio
SET( PARTIO_LIBRARIES partio ${ZLIB_LIBRARY} )

if (${PARTIO_SE_ENABLED})
add_definitions(-DPARTIO_SE_ENABLED=1)
SET(SEEXPR_BASE "c:/aselle/seexpr-inst" CACHE STRING "path to SeExpr")
SET(SEEXPR_INCLUDE_PATH ${SEEXPR_BASE}/include)
SET(SEEXPR_LIBDIR ${CMAKE_INSTALL_LIBDIR})
SET(SEEXPR_LINK_PATH ${SEEXPR_BASE}/${SEEXPR_LIBDIR})
find_library(SEEXPR_LIB SeExpr HINTS ${SEEXPR_LINK_PATH})
endif ()

if (${GTEST_ENABLED})
set($GEST_LOCATION "/usr" CACHE STRING "gtest installation prefix")
set(GTEST_INCLUDE_PATH ${GTEST_BASE}/include)
Expand Down
6 changes: 0 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@ endif
# Installation location: prefix=<path>
CMAKE_FLAGS += -DCMAKE_INSTALL_PREFIX=$(prefix)

# SeExpr v2 location: RP_SeExpr=<path>
ifdef RP_SeExpr
CMAKE_FLAGS += -DSEEXPR_BASE=$(RP_SeExpr)
CMAKE_FLAGS += -DPARTIO_SE_ENABLED=1
endif

# gtest location: RP_gtest=<path>
ifdef RP_gtest
CMAKE_FLAGS += -DGTEST_LOCATION=$(RP_gtest)
Expand Down
2 changes: 0 additions & 2 deletions src/py/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,8 @@ SET(CMAKE_SWIG_FLAGS "")
SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/py)
SET(CMAKE_SWIG_OUTDIR ${PROJECT_BINARY_DIR}/py)

INCLUDE_DIRECTORIES(${SEEXPR_INCLUDE_PATH})
SET_SOURCE_FILES_PROPERTIES(partio.i PROPERTIES CPLUSPLUS ON)
SET_SOURCE_FILES_PROPERTIES(partio.i PROPERTIES SWIG_FLAGS "-includeall")
LINK_DIRECTORIES(${SEEXPR_LINK_PATH})
SWIG_ADD_LIBRARY(partio LANGUAGE python SOURCES partio.i)
SWIG_LINK_LIBRARIES(partio ${PYTHON_LIBRARIES} partio)

Expand Down

0 comments on commit f948507

Please sign in to comment.