Browse Source

Merge pull request #401 from zrax/max_cmake

Only try to find the Max SDK if it was requested
Darryl Pogue 11 years ago
parent
commit
e28d5c36b5
  1. 3
      CMakeLists.txt
  2. 3
      Sources/Tools/CMakeLists.txt
  3. 7
      cmake/FindMaxSDK.cmake

3
CMakeLists.txt

@ -52,9 +52,8 @@ if(WIN32)
find_package(Freetype)
endif(WIN32)
find_package(MaxSDK) #TODO: Only find this if we are building PlasmaMax
find_package(Bink) #TODO: Find Bink, but don't require it if plPipeline isn't built...
# Or better yet, just eliminate bink altogether
# Or better yet, just eliminate bink altogether
include(PrecompiledHeader) #Precompiled Header helper macros
# libCurl isn't smart enough to detect this for us, so we have to configure it ourselves

3
Sources/Tools/CMakeLists.txt

@ -8,7 +8,10 @@ if(PLASMA_BUILD_TOOLS)
endif()
# Max Stuff goes below here...
option(3dsm_BUILD_PLUGIN "Do we want to build the 3ds Max plugin?" OFF)
if(3dsm_BUILD_PLUGIN)
find_package(MaxSDK REQUIRED)
add_definitions(-DBUILDING_MAXPLUGIN)
add_definitions(-DMAXPLUGINCODE)
add_subdirectory(MaxComponent)

7
cmake/FindMaxSDK.cmake

@ -87,9 +87,4 @@ if (3dsm_FOUND)
if(NOT 3dsm_FIND_QUIETLY)
message(STATUS "Found 3ds Max SDK: ${3dsm_PATH}")
endif()
option(3dsm_BUILD_PLUGIN "Do we want to build the 3ds Max plugin?" OFF)
if (3dsm_BUILD_PLUGIN)
add_definitions(-DBUILDING_MAXPLUGIN)
endif()
endif()
endif()

Loading…
Cancel
Save