Commit f2df704d authored by David Thompson's avatar David Thompson

Rename options (issue #85).

This included an automated rename:

    find * -type f -exec vim -S /path/to/vscr {} \;

where `vscr` contained

    %s/SMTK_BUILD_QT/SMTK_ENABLE_QT_SUPPORT/g
    %s/SMTK_BUILD_VTK/SMTK_ENABLE_VTK_SUPPORT/g
    %s/SMTK_BUILD_CGM/SMTK_ENABLE_CGM_SESSION/g
    %s/SMTK_BUILD_SESSION_PLUGIN/SMTK_ENABLE_PARAVIEW_SUPPORT/g
    %s/SMTK_BUILD_MOAB_READER/SMTK_ENABLE_MOAB_SUPPORT/g
    %s/SMTK_BUILD_DISCRETE_SESSION/SMTK_ENABLE_DISCRETE_SESSION/g
    %s/SMTK_BUILD_CGM/SMTK_ENABLE_CGM_SESSION/g
    %s/SMTK_BUILD_PYTHON_WRAPPINGS/SMTK_ENABLE_PYTHON_WRAPPING/g
    wq
parent eaf24846
......@@ -39,7 +39,7 @@ install:
script:
- mkdir ~/smtk-build && cd ~/smtk-build
- cmake -G Ninja "-DSITE:STRING=travis-ci.org" "-DBUILDNAME:STRING=${TRAVIS_OS_NAME}-${CC}-Job.${TRAVIS_JOB_NUMBER}-SMTK" -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DBUILD_SHARED_LIBS:BOOL=ON -DSMTK_BUILD_QT:BOOL=ON -DSMTK_ENABLE_DOCUMENTATION:BOOL=ON -DSMTK_ENABLE_TESTING:BOOL=ON -DSMTK_BUILD_CGMA:BOOL=ON -DCGM_CFG:FILEPATH=/usr/include/cgm.make -DSMTK_BUILD_PYTHON_WRAPPINGS:BOOL=ON "-DShiboken_DIR:PATH=${HOME}/smtk-deps/shiboken/install/lib/cmake/Shiboken-1.2.1" -DSMTK_NO_SYSTEM_BOOST:BOOL=OFF "-DCMAKE_INSTALL_PREFIX=${HOME}/smtk-install" ${TRAVIS_BUILD_DIR}
- cmake -G Ninja "-DSITE:STRING=travis-ci.org" "-DBUILDNAME:STRING=${TRAVIS_OS_NAME}-${CC}-Job.${TRAVIS_JOB_NUMBER}-SMTK" -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DBUILD_SHARED_LIBS:BOOL=ON -DSMTK_ENABLE_QT_SUPPORT:BOOL=ON -DSMTK_ENABLE_DOCUMENTATION:BOOL=ON -DSMTK_ENABLE_TESTING:BOOL=ON -DSMTK_ENABLE_CGM_SESSIONA:BOOL=ON -DCGM_CFG:FILEPATH=/usr/include/cgm.make -DSMTK_ENABLE_PYTHON_WRAPPING:BOOL=ON "-DShiboken_DIR:PATH=${HOME}/smtk-deps/shiboken/install/lib/cmake/Shiboken-1.2.1" -DSMTK_NO_SYSTEM_BOOST:BOOL=OFF "-DCMAKE_INSTALL_PREFIX=${HOME}/smtk-install" ${TRAVIS_BUILD_DIR}
- ninja -j2 ExperimentalStart
- ninja -j2 ExperimentalConfigure
- ninja -j2 ExperimentalBuild
......
......@@ -110,4 +110,4 @@ mark_as_advanced(
ZeroMQ_LIBRARY_DEBUG
ZeroMQ_LIBRARY_RELEASE
ZeroMQ_INCLUDE_DIR
)
\ No newline at end of file
)
......@@ -13,14 +13,14 @@
// Compile-time options chosen for this build of SMTK.
// Was SMTK built with Qt? If true, smtkQtExt library will exist.
#cmakedefine SMTK_BUILD_QT
#cmakedefine SMTK_ENABLE_QT_SUPPORT
// Was SMTK built with VTK? If true, the smtkVTKExt library will exist.
#cmakedefine SMTK_BUILD_VTK
#cmakedefine SMTK_ENABLE_VTK_SUPPORT
// Was SMTK built with discrete model? If true, the smtkDiscreteSession library
// and vtkSMTKDiscreteModel library will exist.
#cmakedefine SMTK_BUILD_DISCRETE_SESSION
#cmakedefine SMTK_ENABLE_DISCRETE_SESSION
// Was SMTK built with exodus-II reader? If true,
// the SMTKExodusSession library will exist.
......@@ -28,10 +28,10 @@
// Was SMTK built with moab reader? If true, the vtkDiscreteMoabReader
// library will exist and smtkDiscreteSession library will link against it.
#cmakedefine SMTK_BUILD_MOAB_READER
#cmakedefine SMTK_ENABLE_MOAB_SUPPORT
// Was SMTK built with CGM? If true, cgm-convert will exist.
#cmakedefine SMTK_BUILD_CGM
#cmakedefine SMTK_ENABLE_CGM_SESSION
// Does CGM provide cgm_version.h (true for v14+, false otherwise).
#cmakedefine CGM_HAVE_VERSION_H
......
......@@ -3,6 +3,9 @@ cmake_policy(SET CMP0020 NEW)
if (POLICY CMP0042)
cmake_policy(SET CMP0042 NEW)
endif()
if (POLICY CMP0046)
cmake_policy(SET CMP0046 NEW)
endif()
if (POLICY CMP0054)
cmake_policy(SET CMP0054 OLD)
endif()
......@@ -46,19 +49,19 @@ include(CMake/FindHashFunctor.cmake)
option(BUILD_SHARED_LIBS "Build SMTK using shared libraries" OFF)
option(SMTK_NO_SYSTEM_BOOST "Allow boost to search for system installed boost" ON)
# Option to build Qt ui compoments for attributes
option(SMTK_BUILD_QT "Build Qt GUI" OFF)
option(SMTK_BUILD_VTK "Build VTK component" OFF)
option(SMTK_BUILD_CGM "Build CGM component" OFF)
option(SMTK_BUILD_DISCRETE_SESSION "Build discrete model session components" OFF)
option(SMTK_BUILD_SESSION_PLUGIN "Build paraview plugin for model sessions" OFF)
option(SMTK_ENABLE_QT_SUPPORT "Build Qt GUI" OFF)
option(SMTK_ENABLE_VTK_SUPPORT "Build VTK component" OFF)
option(SMTK_ENABLE_CGM_SESSION "Build CGM component" OFF)
option(SMTK_ENABLE_DISCRETE_SESSION "Build discrete model session components" OFF)
option(SMTK_ENABLE_PARAVIEW_SUPPORT "Build paraview plugin for model sessions" OFF)
if (SMTK_BUILD_VTK)
if (SMTK_ENABLE_VTK_SUPPORT)
option(SMTK_ENABLE_EXODUS_SESSION "Build a session to Exodus-II side sets" ON)
endif()
option(SMTK_ENABLE_REMUS "Build Remus components" OFF)
option(SMTK_ENABLE_TESTING "Enable Testing" ON)
option(SMTK_BUILD_PYTHON_WRAPPINGS "Build Python Wrappings using Shiboken" OFF)
option(SMTK_ENABLE_PYTHON_WRAPPING "Build Python Wrappings using Shiboken" OFF)
option(SMTK_USE_SYSTEM_SPARSEHASH "Use the system-installed sparsehash?" OFF)
option(SMTK_HASH_STORAGE "Use sparsehash library for primary storage?" OFF)
set(SMTK_DATA_DIR "" CACHE PATH "Path to a directory of SMTK test data.")
......@@ -130,7 +133,7 @@ endif()
################################################################################
#make find qt4 bring in import targets which are far nicer to use
if(SMTK_BUILD_QT)
if(SMTK_ENABLE_QT_SUPPORT)
set(QT_USE_IMPORTED_TARGETS TRUE)
find_package(Qt4 REQUIRED)
include(${QT_USE_FILE})
......@@ -144,7 +147,7 @@ endif()
# Look for Discrete session discrete model modules
################################################################################
if(SMTK_BUILD_SESSION_PLUGIN)
if(SMTK_ENABLE_PARAVIEW_SUPPORT)
find_package(ParaView REQUIRED)
endif()
......@@ -152,8 +155,8 @@ endif()
# VTK Related Settings
################################################################################
if(SMTK_BUILD_VTK)
if(SMTK_BUILD_SESSION_PLUGIN)
if(SMTK_ENABLE_VTK_SUPPORT)
if(SMTK_ENABLE_PARAVIEW_SUPPORT)
find_package(ParaView REQUIRED)
else()
# Find the package here so environment variables are set, but
......@@ -174,9 +177,9 @@ endif()
# CGM Related Settings
################################################################################
if(SMTK_BUILD_CGM)
if(SMTK_ENABLE_CGM_SESSION)
find_package(CGM REQUIRED)
endif(SMTK_BUILD_CGM)
endif(SMTK_ENABLE_CGM_SESSION)
################################################################################
# Remus related settings
......@@ -204,7 +207,7 @@ endif()
################################################################################
# Wrapping Related Settings
################################################################################
if(SMTK_BUILD_PYTHON_WRAPPINGS)
if(SMTK_ENABLE_PYTHON_WRAPPING)
include(UseShiboken)
find_package(PythonInterp 2.7 REQUIRED)
# Set up environment variables needed to import the python modules for tests.
......@@ -352,15 +355,15 @@ include_directories(
# Look for Discrete session discrete model modules
################################################################################
if(SMTK_BUILD_DISCRETE_SESSION)
if(SMTK_BUILD_SESSION_PLUGIN)
if(SMTK_ENABLE_DISCRETE_SESSION)
if(SMTK_ENABLE_PARAVIEW_SUPPORT)
find_package(ParaView REQUIRED)
else()
find_package(VTK REQUIRED)
endif()
# This option is only available when SMTK_BUILD_DISCRETE_SESSION is ON
option(SMTK_BUILD_MOAB_READER "Build moab reader for discrete model" OFF)
# This option is only available when SMTK_ENABLE_DISCRETE_SESSION is ON
option(SMTK_ENABLE_MOAB_SUPPORT "Build moab reader for discrete model" OFF)
endif()
################################################################################
......
......@@ -36,4 +36,4 @@ Thirdparty/pugixml
Thirdparty/cJSON
Thirdparty/sparsehash
Thirdparty/PyYaml
CMake/FindDocutils.cmake
\ No newline at end of file
CMake/FindDocutils.cmake
......@@ -24,8 +24,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
#if (SMTK_ENABLE_TESTING)
# add_executable(add_a_session add_a_session.cxx)
# target_link_libraries(add_a_session smtkCore smtkCoreModelTesting)
# if (SMTK_BUILD_CGM)
# if (SMTK_ENABLE_CGM_SESSION)
# target_link_libraries(add_a_session smtkCGMSession)
# endif (SMTK_BUILD_CGM)
# endif (SMTK_ENABLE_CGM_SESSION)
# add_test(tut-add_a_session ${EXECUTABLE_OUTPUT_PATH}/add_a_session)
#endif()
project(tut_python_debug)
cmake_minimum_required(VERSION 2.8.11)
if (SMTK_ENABLE_TESTING AND SMTK_BUILD_PYTHON_WRAPPINGS AND SMTK_DATA_DIR AND SMTK_BUILD_DISCRETE_SESSION)
if (SMTK_ENABLE_TESTING AND SMTK_ENABLE_PYTHON_WRAPPING AND SMTK_DATA_DIR AND SMTK_ENABLE_DISCRETE_SESSION)
add_test(
NAME tut-debug_python_test
......
......@@ -24,8 +24,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
if (SMTK_ENABLE_TESTING)
add_executable(implement_an_operator implement_an_operator.cxx)
target_link_libraries(implement_an_operator smtkCore smtkCoreModelTesting)
if (SMTK_BUILD_CGM)
if (SMTK_ENABLE_CGM_SESSION)
target_link_libraries(implement_an_operator smtkCGMSession)
endif (SMTK_BUILD_CGM)
endif (SMTK_ENABLE_CGM_SESSION)
add_test(tut-implement_an_operator ${EXECUTABLE_OUTPUT_PATH}/implement_an_operator)
endif()
project(tut_python_first_steps)
cmake_minimum_required(VERSION 2.8.11)
if (SMTK_ENABLE_TESTING AND SMTK_BUILD_PYTHON_WRAPPINGS AND SMTK_DATA_DIR)
if (SMTK_ENABLE_TESTING AND SMTK_ENABLE_PYTHON_WRAPPING AND SMTK_DATA_DIR)
add_test(
NAME tut-python_first_steps
......
......@@ -27,7 +27,7 @@ target_link_libraries(smtkCore
LINK_PRIVATE ${Boost_LIBRARIES})
smtk_export_header(smtkCore CoreExports.h)
if (NOT BUILD_SHARED_LIBS AND SMTK_BUILD_PYTHON_WRAPPINGS)
if (NOT BUILD_SHARED_LIBS AND SMTK_ENABLE_PYTHON_WRAPPING)
# Set position-independent flag when other project libs are shared.
set_target_properties(smtkCore PROPERTIES POSITION_INDEPENDENT_CODE True)
endif()
......@@ -70,7 +70,7 @@ install(
install(EXPORT SMTK-targets DESTINATION lib)
#wrap everything
if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
if(SMTK_ENABLE_PYTHON_WRAPPING AND Shiboken_FOUND)
sbk_wrap_library(smtkCore
GENERATOR_ARGS --avoid-protected-hack
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
......
add_subdirectory(cxx)
if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
if(SMTK_ENABLE_PYTHON_WRAPPING AND Shiboken_FOUND)
add_subdirectory(python)
endif()
......@@ -2,14 +2,14 @@
################################################################################
# Build cgm session
################################################################################
if (SMTK_BUILD_CGM AND CGM_FOUND)
if (SMTK_ENABLE_CGM_SESSION AND CGM_FOUND)
add_subdirectory(cgm)
endif()
################################################################################
# Build Discrete session
################################################################################
if(SMTK_BUILD_DISCRETE_SESSION)
if(SMTK_ENABLE_DISCRETE_SESSION)
add_subdirectory(discrete)
endif()
......
......@@ -129,7 +129,7 @@ target_link_libraries(cgm-convert smtkCore smtkCGMSession ${CGM_LIBRARIES})
add_executable(facet-convert facet-convert.cxx)
target_link_libraries(facet-convert smtkCore ${CGM_LIBRARIES})
if (SMTK_BUILD_VTK)
if (SMTK_ENABLE_VTK_SUPPORT)
include("${VTK_USE_FILE}")
add_executable(vtk-to-cholla vtk-to-cholla.cxx)
target_link_libraries(vtk-to-cholla
......@@ -141,7 +141,7 @@ if (SMTK_BUILD_VTK)
endif()
if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
if(SMTK_ENABLE_PYTHON_WRAPPING AND Shiboken_FOUND)
#extract the headers from cgm library we built to give them to shiboken
sbk_wrap_library(smtkCGMSession
......@@ -167,7 +167,7 @@ if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
PRIVATE ${CGM_INCLUDE_DIRS})
endif()
if(SMTK_BUILD_SESSION_PLUGIN)
if(SMTK_ENABLE_PARAVIEW_SUPPORT)
add_subdirectory(plugin)
endif()
......
add_subdirectory(cxx)
if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
if(SMTK_ENABLE_PYTHON_WRAPPING AND Shiboken_FOUND)
add_subdirectory(python)
endif()
......@@ -28,7 +28,7 @@ vtk_smtk_setup_module_environment("SMTKDiscrete")
vtk_smtk_process_modules()
# Build vtk moab reader before session
if(SMTK_BUILD_MOAB_READER)
if(SMTK_ENABLE_MOAB_SUPPORT)
add_subdirectory(moabreader)
endif()
......@@ -166,7 +166,7 @@ if (VTK_WRAP_PYTHON)
list(APPEND __private_dependencies vtkPythonInterpreter)
endif (VTK_WRAP_PYTHON)
if(SMTK_BUILD_MOAB_READER)
if(SMTK_ENABLE_MOAB_SUPPORT)
list(APPEND __private_dependencies vtkDiscreteMoabReader)
endif()
......@@ -204,7 +204,7 @@ smtk_public_headers(${discreteSessionHeaders} ${DiscreteModelHeaders})
#install the library and exports the library when used from a build tree
smtk_install_library(smtkDiscreteSession DEPENDS smtkCore vtkSMTKDiscreteModel vtkSMTKDiscreteExt)
if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
if(SMTK_ENABLE_PYTHON_WRAPPING AND Shiboken_FOUND)
#extract the headers from discrete library we built to give them to shiboken
sbk_wrap_library(smtkDiscreteSession
......@@ -240,7 +240,7 @@ if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
)
endif()
if(SMTK_BUILD_SESSION_PLUGIN AND SMTK_BUILD_DISCRETE_SESSION)
if(SMTK_ENABLE_PARAVIEW_SUPPORT AND SMTK_ENABLE_DISCRETE_SESSION)
add_subdirectory(plugin)
endif()
......
......@@ -29,7 +29,7 @@ static const char Session_json[] =
" ,\".2dm (CMB Mesh Files)\""
" ,\".3dm (CMB Mesh Files)\""
" ,\".stl (STL Files)\""
#ifdef SMTK_BUILD_MOAB_READER
#ifdef SMTK_ENABLE_MOAB_SUPPORT
" ,\".exo (Moab Files)\""
#endif
#ifdef SMTK_ENABLE_REMUS
......
......@@ -18,4 +18,4 @@ if(SMTK_ENABLE_REMUS)
)
endif()
smtk_public_headers(${headers})
\ No newline at end of file
smtk_public_headers(${headers})
......@@ -22,4 +22,4 @@ if(SMTK_ENABLE_REMUS)
)
endif()
smtk_public_headers(${headers})
\ No newline at end of file
smtk_public_headers(${headers})
......@@ -38,7 +38,7 @@
#include "smtk/bridge/discrete/extension/meshing/vtkCMBTriangleMesher.h"
#endif
#ifdef SMTK_BUILD_MOAB_READER
#ifdef SMTK_ENABLE_MOAB_SUPPORT
#include "smtk/bridge/discrete/moabreader/vtkCmbMoabReader.h"
#endif
......@@ -72,7 +72,7 @@ bool ImportOperator::ableToOperate()
std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower);
bool able = (ext == ".vtk" || ext == ".2dm" ||
ext == ".3dm" ||
#ifdef SMTK_BUILD_MOAB_READER
#ifdef SMTK_ENABLE_MOAB_SUPPORT
ext == ".exo" ||
#endif
#ifdef SMTK_ENABLE_REMUS
......@@ -135,7 +135,7 @@ OperatorResult ImportOperator::operateInternal()
std::string ext = vtksys::SystemTools::GetFilenameLastExtension(filename);
if(ext == ".exo")
{
#ifdef SMTK_BUILD_MOAB_READER
#ifdef SMTK_ENABLE_MOAB_SUPPORT
vtkNew<vtkCmbMoabReader> reader;
reader->SetFileName(filename.c_str());
......
if (SMTK_BUILD_DISCRETE_SESSION)
if (SMTK_ENABLE_DISCRETE_SESSION)
find_package(ParaView REQUIRED)
include(${PARAVIEW_USE_FILE})
......
......@@ -11,8 +11,8 @@
#include "smtk/Options.h"
#include "smtk/AutoInit.h"
#ifdef SMTK_BUILD_DISCRETE_SESSION
#ifdef SMTK_ENABLE_DISCRETE_SESSION
// If CMB-session is included in the build, ensure that it is loaded
// (and thus registered with the model manager).
smtkComponentInitMacro(smtk_discrete_session);
#endif // SMTK_BUILD_DISCRETE_SESSION
#endif // SMTK_ENABLE_DISCRETE_SESSION
add_subdirectory(cxx)
if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
if(SMTK_ENABLE_PYTHON_WRAPPING AND Shiboken_FOUND)
add_subdirectory(python)
endif()
......@@ -2,7 +2,7 @@
# that require VTK include paths. Otherwise, command
# lines get too long on some platforms.
include("${VTK_USE_FILE}")
list(APPEND CMAKE_MODULE_PATH "${VTK_MODULES_DIR}")
list(APPEND CMAKE_MODULE_PATH "${VTK_MODULES_DIR}")
set(exodusSrcs
Session.cxx
......@@ -56,7 +56,7 @@ smtk_session_json("${CMAKE_CURRENT_SOURCE_DIR}/Session.json" exodusSessionJSON)
# Install the headers
smtk_public_headers(${exodusHeaders})
if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
if(SMTK_ENABLE_PYTHON_WRAPPING AND Shiboken_FOUND)
#extract the headers from exodus library we built to give them to shiboken
sbk_wrap_library(smtkExodusSession
......@@ -82,7 +82,7 @@ target_include_directories(smtkExodusSessionPython
PRIVATE ${EXODUS_INCLUDE_DIRS})
endif()
if(SMTK_BUILD_SESSION_PLUGIN)
if(SMTK_ENABLE_PARAVIEW_SUPPORT)
add_subdirectory(plugin)
endif()
......
#add_subdirectory(cxx)
if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
if(SMTK_ENABLE_PYTHON_WRAPPING AND Shiboken_FOUND)
add_subdirectory(python)
endif()
......@@ -32,7 +32,7 @@ target_include_directories(smtkRemoteSession
${REMUS_INCLUDE_DIRS}
)
if (SMTK_BUILD_CGM)
if (SMTK_ENABLE_CGM_SESSION)
target_include_directories(smtkRemoteSession PRIVATE ${CGM_INCLUDE_DIRS})
endif()
......@@ -75,12 +75,12 @@ target_link_libraries(smtk-model-worker
${Boost_LIBRARIES}
)
target_include_directories(smtk-model-worker PRIVATE ${REMUS_INCLUDE_DIRS})
if (SMTK_BUILD_CGM)
if (SMTK_ENABLE_CGM_SESSION)
target_link_libraries(smtk-model-worker smtkCGMSession)
target_include_directories(smtk-model-worker PRIVATE ${CGM_INCLUDE_DIRS})
endif()
if (SMTK_BUILD_DISCRETE_SESSION)
if (SMTK_ENABLE_DISCRETE_SESSION)
target_link_libraries(smtk-model-worker smtkDiscreteSession)
endif()
......@@ -99,7 +99,7 @@ install(TARGETS smtk-model-server smtk-model-worker
ARCHIVE DESTINATION lib
)
if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
if(SMTK_ENABLE_PYTHON_WRAPPING AND Shiboken_FOUND)
#extract the headers from the library we built to give them to shiboken
sbk_wrap_library(smtkRemoteSession
......@@ -124,6 +124,6 @@ if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
#target_include_directories(smtkRemoteSessionPython PRIVATE ${CGM_INCLUDE_DIRS})
endif()
if(SMTK_BUILD_SESSION_PLUGIN)
if(SMTK_ENABLE_PARAVIEW_SUPPORT)
add_subdirectory(plugin)
endif()
......@@ -57,14 +57,14 @@ int smtkChDir(const std::string& path) { return _chdir(path.c_str()); }
// ++ UserGuide/Model/1 ++
#include "smtk/AutoInit.h"
#ifdef SMTK_BUILD_CGM
#ifdef SMTK_ENABLE_CGM_SESSION
smtkComponentInitMacro(smtk_cgm_session);
#include "smtk/bridge/cgm/Engines.h"
#endif // SMTK_BUILD_CGM
#endif // SMTK_ENABLE_CGM_SESSION
#ifdef SMTK_BUILD_DISCRETE_SESSION
#ifdef SMTK_ENABLE_DISCRETE_SESSION
smtkComponentInitMacro(smtk_discrete_session);
#endif // SMTK_BUILD_DISCRETE_SESSION
#endif // SMTK_ENABLE_DISCRETE_SESSION
// -- UserGuide/Model/1 --
int usage(
......
add_subdirectory(cxx)
if (SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
if (SMTK_ENABLE_PYTHON_WRAPPING AND Shiboken_FOUND)
add_subdirectory(python)
endif()
......@@ -7,10 +7,10 @@ target_link_libraries(integrationRemoteSession
RemusCommon
RemusClient
)
if (SMTK_BUILD_CGM)
if (SMTK_ENABLE_CGM_SESSION)
target_link_libraries(integrationRemoteSession smtkCGMSession)
endif()
if (SMTK_ENABLE_TESTING AND SMTK_DATA_DIR AND SMTK_BUILD_CGM)
if (SMTK_ENABLE_TESTING AND SMTK_DATA_DIR AND SMTK_ENABLE_CGM_SESSION)
add_test(
NAME unitGenerateRemoteModelWorker
COMMAND
......
......@@ -27,7 +27,7 @@
using namespace smtk::model;
using namespace smtk::bridge::remote;
#ifdef SMTK_BUILD_CGM
#ifdef SMTK_ENABLE_CGM_SESSION
smtkComponentInitMacro(smtk_cgm_session);
#endif
......
add_subdirectory(cxx)
if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
if(SMTK_ENABLE_PYTHON_WRAPPING AND Shiboken_FOUND)
add_subdirectory(python)
endif()
# Add the Qt GUI code if enabled
if(SMTK_BUILD_QT)
if(SMTK_ENABLE_QT_SUPPORT)
add_subdirectory(qt)
endif()
......@@ -12,8 +12,8 @@ if (SMTK_ENABLE_REMUS)
endif()
# Add VTK library to render SMTK geometry and interact with ParaView-based apps if enabled.
if(SMTK_BUILD_VTK)
if(SMTK_BUILD_SESSION_PLUGIN)
if(SMTK_ENABLE_VTK_SUPPORT)
if(SMTK_ENABLE_PARAVIEW_SUPPORT)
#Only include the ParaView use-file in subdirectories
# that require ParaView include paths.
......@@ -58,7 +58,7 @@ if(SMTK_BUILD_VTK)
# vtk_module_library() macro and vtk/module.cmake file.
# The pv_process_modules() macro finds all subdirectories
# containing a module.cmake file automatically.
include (smtkVTKExtModules)
include (smtkVTKModules)
vtk_smtk_setup_module_environment("VTKSMTK")
vtk_smtk_process_modules()
endif()
......
......@@ -19,7 +19,7 @@ if (BUILD_SHARED_LIBS)
set_target_properties(smtkRemusExt PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
endif()
if (SMTK_BUILD_PYTHON_WRAPPINGS)
if (SMTK_ENABLE_PYTHON_WRAPPING)
add_library(smtkRemusExtPy MODULE smtkRemusExtPy.cxx)
target_include_directories(smtkRemusExtPy PRIVATE ${PYTHON_INCLUDE_DIRS})
target_link_libraries(smtkRemusExtPy
......
if (SMTK_BUILD_DISCRETE_SESSION)
if (SMTK_ENABLE_DISCRETE_SESSION)
find_package(ParaView REQUIRED)
include(${PARAVIEW_USE_FILE})
......
if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
if(SMTK_ENABLE_PYTHON_WRAPPING AND Shiboken_FOUND)
add_subdirectory(python)
endif()
......@@ -71,12 +71,13 @@ smtk_install_library(vtkSMTKExt)
# Potentially wrap in Python using VTK's wrapping methods, not shiboken.
# This makes the filters available for use with other VTK-wrapped filters.
if (SMTK_BUILD_PYTHON_WRAPPINGS AND VTK_WRAP_PYTHON)
if (SMTK_ENABLE_PYTHON_WRAPPING AND VTK_WRAP_PYTHON)
vtk_wrap_python3(vtkSMTKExtPython SMTKVTKPY_SRCS "${VTKLibHeaders}")
add_library(vtkSMTKExtPythonD ${SMTKVTKPY_SRCS} ${SMTKVTKPY_EXTRA_SRCS})
python_add_module(vtkSMTKExtPython
vtkSMTKExtPythonInit.cxx
vtkSMTKExtPythonInitImpl.cxx)
vtkSMTKExtPythonInitImpl.cxx
)
target_link_libraries(vtkSMTKExtPythonD
PUBLIC
vtkSMTKExt
......
add_subdirectory(cxx)
if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
if(SMTK_ENABLE_PYTHON_WRAPPING AND Shiboken_FOUND)
add_subdirectory(python)
endif()
add_subdirectory(cxx)
if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
if(SMTK_ENABLE_PYTHON_WRAPPING AND Shiboken_FOUND)
add_subdirectory(python)
endif()
......@@ -31,9 +31,9 @@ add_test(unitTessellation ${EXECUTABLE_OUTPUT_PATH}/unitTessellation)
add_executable(unitOperator unitOperator.cxx)
smtk_operator_xml( "${CMAKE_CURRENT_SOURCE_DIR}/unitOutcomeOperator.sbt" unitOperatorXML)
target_link_libraries(unitOperator smtkCore smtkCoreModelTesting)
if (SMTK_BUILD_CGM)
if (SMTK_ENABLE_CGM_SESSION)
target_link_libraries(unitOperator smtkCGMSession)
endif (SMTK_BUILD_CGM)
endif (SMTK_ENABLE_CGM_SESSION)
add_test(unitOperator ${EXECUTABLE_OUTPUT_PATH}/unitOperator)
add_executable(unitEntityRef unitEntityRef.cxx)
......
......@@ -11,7 +11,7 @@ set(smtkModelPythonDataTests
)
# Additional tests that require specific bridges
if (SMTK_ENABLE_EXODUS_SESSION AND SMTK_BUILD_DISCRETE_SESSION AND SMTK_BUILD_CGM)
if (SMTK_ENABLE_EXODUS_SESSION AND SMTK_ENABLE_DISCRETE_SESSION AND SMTK_ENABLE_CGM_SESSION)
set(smtkModelPythonDataTests
${smtkModelPythonDataTests}
integrationMultiSessionDescriptivePhrase
......
add_subdirectory(cxx)
if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
if(SMTK_ENABLE_PYTHON_WRAPPING AND Shiboken_FOUND)
add_subdirectory(python)
endif()
add_subdirectory(cxx)
if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
if(SMTK_ENABLE_PYTHON_WRAPPING AND Shiboken_FOUND)
add_subdirectory(python)
endif()
project(cJSON)
add_library(cJSON STATIC cJSON.c)
if (BUILD_SHARED_LIBS OR SMTK_BUILD_PYTHON_WRAPPINGS)
if (BUILD_SHARED_LIBS OR SMTK_ENABLE_PYTHON_WRAPPING)
# Set position-independent flag when other project libs are shared.
set_target_properties(cJSON PROPERTIES POSITION_INDEPENDENT_CODE True)
endif()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment