From 4b49178920e25e9b5692df97aa0201f415baf977 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 26 Jan 2014 14:19:15 +0100 Subject: [PATCH] + Fix usage of Pivy from old LibPacks --- src/3rdParty/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/3rdParty/CMakeLists.txt b/src/3rdParty/CMakeLists.txt index 1027fc5f5b..520661f9ca 100644 --- a/src/3rdParty/CMakeLists.txt +++ b/src/3rdParty/CMakeLists.txt @@ -3,10 +3,11 @@ if(FREECAD_BUILD_CAM) add_subdirectory(ANN) endif(FREECAD_BUILD_CAM) -if(FREECAD_BUILD_GUI AND FREECAD_LIBPACK_CHECKFILE6X) - add_subdirectory(Pivy) -elseif(FREECAD_BUILD_GUI AND FREECAD_LIBPACK_CHECKFILE7X) - add_subdirectory(Pivy-0.5) +if(FREECAD_BUILD_GUI AND NOT FREECAD_USE_EXTERNAL_PIVY) + if(FREECAD_LIBPACK_CHECKFILE6X) + add_subdirectory(Pivy) + elseif(FREECAD_LIBPACK_CHECKFILE7X) + add_subdirectory(Pivy-0.5) #elseif(FREECAD_BUILD_GUI AND FREECAD_LIBPACK_CHECKCUSTOM) # find_path(COIN_VERSION3 Inventor/scxml/ScXML.h ${COIN3D_INCLUDE_DIR}) # if (COIN_VERSION3) @@ -19,8 +20,7 @@ elseif(FREECAD_BUILD_GUI AND FREECAD_LIBPACK_CHECKFILE7X) # add_subdirectory(Pivy) #endif(MINGW) # applies for Unix, MinGW and Windows with custom LibPack -elseif(FREECAD_BUILD_GUI) - if (NOT FREECAD_USE_EXTERNAL_PIVY) + else(FREECAD_LIBPACK_CHECKFILE6X) find_path(COIN_VERSION3 Inventor/scxml/ScXML.h ${COIN3D_INCLUDE_DIR}) if (COIN_VERSION3) if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy-0.5) @@ -31,8 +31,8 @@ elseif(FREECAD_BUILD_GUI) add_subdirectory(Pivy) endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy) endif(COIN_VERSION3) - endif (NOT FREECAD_USE_EXTERNAL_PIVY) -endif(FREECAD_BUILD_GUI AND FREECAD_LIBPACK_CHECKFILE6X) + endif (FREECAD_LIBPACK_CHECKFILE6X) +endif(FREECAD_BUILD_GUI AND NOT FREECAD_USE_EXTERNAL_PIVY) # Build SalomeMesh for all Platforms since heavily patched add_subdirectory(salomesmesh)