diff --git a/cMake/FindCoin3D.cmake b/cMake/FindCoin3D.cmake deleted file mode 100644 index 8e14ef41f802..000000000000 --- a/cMake/FindCoin3D.cmake +++ /dev/null @@ -1,125 +0,0 @@ -# Try to find Coin3D -# Once done this will define -# -# COIN3D_FOUND - system has Coin3D - Open Inventor -# COIN3D_INCLUDE_DIRS - where the Inventor include directory can be found -# COIN3D_LIBRARIES - Link this to use Coin3D -# - -SET( COIN3D_FOUND "NO" ) - -IF (WIN32) - IF (CYGWIN OR MINGW) - - FIND_PATH(COIN3D_INCLUDE_DIRS Inventor/So.h - ${CMAKE_INCLUDE_PATH} - /usr/include - /usr/local/include - /usr/include/coin - ) - - FIND_LIBRARY(COIN3D_LIBRARIES Coin - ${CMAKE_LIBRARY_PATH} - /usr/lib - /usr/local/lib - ) - - ELSE (CYGWIN OR MINGW) - - FIND_PATH(COIN3D_INCLUDE_DIRS Inventor/So.h - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\SIM\\Coin3D\\2;Installation Path]/include" - ) - - FIND_LIBRARY(COIN3D_LIBRARY_DEBUG coin2d - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\SIM\\Coin3D\\2;Installation Path]/lib" - ) - - FIND_LIBRARY(COIN3D_LIBRARY_RELEASE - NAMES - coin2 - Coin4 - PATHS - ${CMAKE_LIBRARY_PATH} - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\SIM\\Coin3D\\2;Installation Path]/lib" - ) - - IF (COIN3D_LIBRARY_DEBUG AND COIN3D_LIBRARY_RELEASE) - SET(COIN3D_LIBRARIES optimized ${COIN3D_LIBRARY_RELEASE} - debug ${COIN3D_LIBRARY_DEBUG}) - ELSE (COIN3D_LIBRARY_DEBUG AND COIN3D_LIBRARY_RELEASE) - IF (COIN3D_LIBRARY_DEBUG) - SET (COIN3D_LIBRARIES ${COIN3D_LIBRARY_DEBUG}) - ENDIF (COIN3D_LIBRARY_DEBUG) - IF (COIN3D_LIBRARY_RELEASE) - SET (COIN3D_LIBRARIES ${COIN3D_LIBRARY_RELEASE}) - ENDIF (COIN3D_LIBRARY_RELEASE) - ENDIF (COIN3D_LIBRARY_DEBUG AND COIN3D_LIBRARY_RELEASE) - - IF (COIN3D_LIBRARIES) - # ADD_DEFINITIONS ( -DCOIN_NOT_DLL ) - #ELSE (COIN3D_LIBRARIES) - # SET (COIN3D_LIBRARIES coin2d CACHE STRING "Coin3D Library (Debug) - Open Inventor API") - ENDIF (COIN3D_LIBRARIES) - - ENDIF (CYGWIN OR MINGW) - -ELSE (WIN32) - IF(APPLE) - FIND_PATH(COIN3D_INCLUDE_DIRS Inventor/So.h - /Library/Frameworks/Inventor.framework/Headers - /usr/local/include - /usr/include - ) - FIND_LIBRARY(COIN3D_LIBRARIES Coin - /Library/Frameworks/Inventor.framework/Libraries - /usr/lib - /usr/local/lib - ) - SET(COIN3D_LIBRARIES "-framework Coin3d" CACHE STRING "Coin3D library for OSX") - ELSE(APPLE) - # Try to use pkg-config first... - find_package(PkgConfig) - pkg_check_modules(COIN3D Coin) - # ... then fall back to manual lookup - IF(NOT COIN3D_FOUND) - FIND_PATH(COIN3D_INCLUDE_DIRS Inventor/So.h - ${CMAKE_INCLUDE_PATH} - /usr/include/Coin3 - /usr/include - /usr/include/coin - /usr/local/include - ) - - FIND_LIBRARY(COIN3D_LIBRARIES Coin - ${CMAKE_LIBRARY_PATH} - /usr/lib - /usr/local/lib - PATH_SUFFIXES Coin2 Coin3 - ) - ENDIF(NOT COIN3D_FOUND) - ENDIF(APPLE) - -ENDIF (WIN32) - - -IF(COIN3D_LIBRARIES) - SET( COIN3D_FOUND "YES" ) - message(STATUS "Coin3D libraries found") - - IF(NOT COIN3D_VERSION) - file(READ "${COIN3D_INCLUDE_DIRS}/Inventor/C/basic.h" _coin3d_basic_h) - string(REGEX MATCH "define[ \t]+COIN_MAJOR_VERSION[ \t]+([0-9?])" _coin3d_major_version_match "${_coin3d_basic_h}") - set(COIN3D_MAJOR_VERSION "${CMAKE_MATCH_1}") - string(REGEX MATCH "define[ \t]+COIN_MINOR_VERSION[ \t]+([0-9?])" _coin3d_minor_version_match "${_coin3d_basic_h}") - set(COIN3D_MINOR_VERSION "${CMAKE_MATCH_1}") - string(REGEX MATCH "define[ \t]+COIN_MICRO_VERSION[ \t]+([0-9?])" _coin3d_micro_version_match "${_coin3d_basic_h}") - set(COIN3D_MICRO_VERSION "${CMAKE_MATCH_1}") - set(COIN3D_VERSION "${COIN3D_MAJOR_VERSION}.${COIN3D_MINOR_VERSION}.${COIN3D_MICRO_VERSION}") - ENDIF() - - IF(NOT PIVY_VERSION) - execute_process (COMMAND ${Python3_EXECUTABLE} -c "import pivy as p; print(p.__version__,end='')" OUTPUT_VARIABLE PIVY_VERSION) - ENDIF() - -ENDIF(COIN3D_LIBRARIES) - diff --git a/cMake/FreeCAD_Helpers/SetupCoin3D.cmake b/cMake/FreeCAD_Helpers/SetupCoin3D.cmake index b50db9a93d14..e06e76e7555b 100644 --- a/cMake/FreeCAD_Helpers/SetupCoin3D.cmake +++ b/cMake/FreeCAD_Helpers/SetupCoin3D.cmake @@ -8,4 +8,8 @@ macro(SetupCoin3D) "=================\n") endif(NOT COIN3D_FOUND) + IF(NOT PIVY_VERSION) + execute_process (COMMAND ${Python3_EXECUTABLE} -c "import pivy as p; print(p.__version__,end='')" OUTPUT_VARIABLE PIVY_VERSION) + ENDIF() + endmacro(SetupCoin3D)