+ harmonize Coin3D cmake variables with official check

Frank0587 · Jul 28, 2015 · b81482d · b81482d
1 parent 7d98705
commit b81482d
Show file tree

Hide file tree

Showing 31 changed files with 66 additions and 63 deletions.
diff --git a/cMake/FindCoin3D.cmake b/cMake/FindCoin3D.cmake
@@ -2,28 +2,28 @@
 # Once done this will define
 #
 # COIN3D_FOUND        - system has Coin3D - Open Inventor
-# COIN3D_INCLUDE_DIR  - where the Inventor include directory can be found
-# COIN3D_LIBRARY      - Link this to use Coin3D
+# COIN3D_INCLUDE_DIRS - where the Inventor include directory can be found
+# COIN3D_LIBRARIES    - Link this to use Coin3D
 #
 
 
 IF (WIN32)
   IF (CYGWIN)
 
-    FIND_PATH(COIN3D_INCLUDE_DIR Inventor/So.h
+    FIND_PATH(COIN3D_INCLUDE_DIRS Inventor/So.h
       /usr/include
       /usr/local/include
       /usr/include/coin
     )
 
-    FIND_LIBRARY(COIN3D_LIBRARY Coin
+    FIND_LIBRARY(COIN3D_LIBRARIES Coin
       /usr/lib
       /usr/local/lib
     )
 
   ELSE (CYGWIN)
 
-    FIND_PATH(COIN3D_INCLUDE_DIR Inventor/So.h
+    FIND_PATH(COIN3D_INCLUDE_DIRS Inventor/So.h
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\SIM\\Coin3D\\2;Installation Path]/include"
     )
 
@@ -36,47 +36,47 @@ IF (WIN32)
     )
 
     IF (COIN3D_LIBRARY_DEBUG AND COIN3D_LIBRARY_RELEASE)
-      SET(COIN3D_LIBRARY optimized ${COIN3D_LIBRARY_RELEASE}
-                         debug ${COIN3D_LIBRARY_DEBUG})
+      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_LIBRARY ${COIN3D_LIBRARY_DEBUG})
+        SET (COIN3D_LIBRARIES ${COIN3D_LIBRARY_DEBUG})
       ENDIF (COIN3D_LIBRARY_DEBUG)
       IF (COIN3D_LIBRARY_RELEASE)
-        SET (COIN3D_LIBRARY ${COIN3D_LIBRARY_RELEASE})
+        SET (COIN3D_LIBRARIES ${COIN3D_LIBRARY_RELEASE})
       ENDIF (COIN3D_LIBRARY_RELEASE)
     ENDIF (COIN3D_LIBRARY_DEBUG AND COIN3D_LIBRARY_RELEASE)
 
-    IF (COIN3D_LIBRARY)
+    IF (COIN3D_LIBRARIES)
     #  ADD_DEFINITIONS ( -DCOIN_NOT_DLL )
-    #ELSE (COIN3D_LIBRARY)
-    #  SET (COIN3D_LIBRARY coin2d CACHE STRING "Coin3D Library (Debug) - Open Inventor API")
-    ENDIF (COIN3D_LIBRARY)
+    #ELSE (COIN3D_LIBRARIES)
+    #  SET (COIN3D_LIBRARIES coin2d CACHE STRING "Coin3D Library (Debug) - Open Inventor API")
+    ENDIF (COIN3D_LIBRARIES)
 
   ENDIF (CYGWIN)
 
 ELSE (WIN32)
   IF(APPLE)
-    FIND_PATH(COIN3D_INCLUDE_DIR Inventor/So.h
+    FIND_PATH(COIN3D_INCLUDE_DIRS Inventor/So.h
      /Library/Frameworks/Inventor.framework/Headers 
      /usr/local/include
      /usr/include
     )
-    FIND_LIBRARY(COIN3D_LIBRARY Coin
+    FIND_LIBRARY(COIN3D_LIBRARIES Coin
       /Library/Frameworks/Inventor.framework/Libraries
       /usr/lib
       /usr/local/lib
     )   
-    SET(COIN3D_LIBRARY "-framework Coin3d" CACHE STRING "Coin3D library for OSX")
+    SET(COIN3D_LIBRARIES "-framework Coin3d" CACHE STRING "Coin3D library for OSX")
    ELSE(APPLE)
 
-  FIND_PATH(COIN3D_INCLUDE_DIR Inventor/So.h
+  FIND_PATH(COIN3D_INCLUDE_DIRS Inventor/So.h
     /usr/include/Coin3
     /usr/include
     /usr/local/include
   )
 
-  FIND_LIBRARY(COIN3D_LIBRARY Coin
+  FIND_LIBRARY(COIN3D_LIBRARIES Coin
     /usr/lib
     /usr/local/lib
     PATH_SUFFIXES Coin2 Coin3
@@ -87,7 +87,7 @@ ENDIF (WIN32)
 
 
 SET( COIN3D_FOUND "NO" )
-IF(COIN3D_LIBRARY)
+IF(COIN3D_LIBRARIES)
   SET( COIN3D_FOUND "YES" )
-ENDIF(COIN3D_LIBRARY)
+ENDIF(COIN3D_LIBRARIES)
 
diff --git a/cMake/UseLibPack10x.cmake b/cMake/UseLibPack10x.cmake
@@ -68,7 +68,7 @@ set(SMESH_FOUND TRUE)
 
 # Coin3D
 
-find_path(COIN3D_INCLUDE_DIR Inventor/So.h
+find_path(COIN3D_INCLUDE_DIRS Inventor/So.h
 ${FREECAD_LIBPACK_DIR}/include/Coin-4.0.0
 )
 find_library(COIN3D_LIBRARY_RELEASE coin4
@@ -77,6 +77,8 @@ find_library(COIN3D_LIBRARY_RELEASE coin4
 find_library(COIN3D_LIBRARY_DEBUG coin4d
     "${FREECAD_LIBPACK_DIR}/lib"
 )
+set(COIN3D_LIBRARIES optimized ${COIN3D_LIBRARY_RELEASE}
+                     debug ${COIN3D_LIBRARY_DEBUG})
 
 set(COIN3D_FOUND TRUE) 
 

diff --git a/cMake/UseLibPack6x.cmake b/cMake/UseLibPack6x.cmake
@@ -63,9 +63,11 @@ set(SMESH_LIBRARIES
 set(SMESH_FOUND TRUE) 
 
 # Coin3D
-set(COIN3D_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/coin)
+set(COIN3D_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/coin)
 set(COIN3D_LIBRARY_DEBUG  coin2d.lib)
 set(COIN3D_LIBRARY_RELEASE  coin2.lib)
+set(COIN3D_LIBRARIES optimized ${COIN3D_LIBRARY_RELEASE}
+                     debug ${COIN3D_LIBRARY_DEBUG})
 set(COIN3D_FOUND TRUE) 
 
 

diff --git a/cMake/UseLibPack7x.cmake b/cMake/UseLibPack7x.cmake
@@ -72,9 +72,11 @@ set(SMESH_LIBRARIES
 set(SMESH_FOUND TRUE) 
 
 # Coin3D
-set(COIN3D_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/coin)
+set(COIN3D_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/coin)
 set(COIN3D_LIBRARY_DEBUG  coin3d.lib)
 set(COIN3D_LIBRARY_RELEASE  coin3.lib)
+set(COIN3D_LIBRARIES optimized ${COIN3D_LIBRARY_RELEASE}
+                     debug ${COIN3D_LIBRARY_DEBUG})
 set(COIN3D_FOUND TRUE) 
 
 

diff --git a/cMake/UseLibPack8x.cmake b/cMake/UseLibPack8x.cmake
@@ -84,9 +84,11 @@ set(ZLIB_FOUND TRUE)
 #set(SMESH_FOUND TRUE) 
 
 # Coin3D
-set(COIN3D_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/coin)
+set(COIN3D_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/coin)
 set(COIN3D_LIBRARY_DEBUG  coin3d.lib)
 set(COIN3D_LIBRARY_RELEASE  coin3.lib)
+set(COIN3D_LIBRARIES optimized ${COIN3D_LIBRARY_RELEASE}
+                     debug ${COIN3D_LIBRARY_DEBUG})
 set(COIN3D_FOUND TRUE) 
 
 

diff --git a/cMake/UseLibPack9x.cmake b/cMake/UseLibPack9x.cmake
@@ -67,24 +67,17 @@ set(SMESH_LIBRARIES
 set(SMESH_FOUND TRUE) 
 
 # Coin3D
-find_path(COIN3D_INCLUDE_DIR Inventor/So.h
-${FREECAD_LIBPACK_DIR}/include/Coin-2.4.5
-)
-find_path(COIN3D_INCLUDE_DIR Inventor/So.h
+find_path(COIN3D_INCLUDE_DIRS Inventor/So.h
 ${FREECAD_LIBPACK_DIR}/include/Coin-4.0.0
 )
-find_library(COIN3D_LIBRARY_RELEASE coin2
-    "${FREECAD_LIBPACK_DIR}/lib"
-)
-find_library(COIN3D_LIBRARY_DEBUG coin2d
-    "${FREECAD_LIBPACK_DIR}/lib"
-)
 find_library(COIN3D_LIBRARY_RELEASE coin4
     "${FREECAD_LIBPACK_DIR}/lib"
 )
 find_library(COIN3D_LIBRARY_DEBUG coin4d
     "${FREECAD_LIBPACK_DIR}/lib"
 )
+set(COIN3D_LIBRARIES optimized ${COIN3D_LIBRARY_RELEASE}
+                     debug ${COIN3D_LIBRARY_DEBUG})
 
 set(COIN3D_FOUND TRUE) 
 

diff --git a/cMake/UseLibPackCLbundler.cmake b/cMake/UseLibPackCLbundler.cmake
@@ -18,6 +18,8 @@ set(XercesC_FOUND TRUE)
 
 find_library(COIN3D_LIBRARY_RELEASE coin4 "${FREECAD_LIBPACK_DIR}/lib")
 find_library(COIN3D_LIBRARY_DEBUG coin4d "${FREECAD_LIBPACK_DIR}/lib")
+set(COIN3D_LIBRARIES optimized ${COIN3D_LIBRARY_RELEASE}
+                     debug ${COIN3D_LIBRARY_DEBUG})
 set(COIN3D_FOUND TRUE)
 
 set(NETGENDATA ${FREECAD_LIBPACK_DIR}/include/netgen)

diff --git a/cMake/UseLibPackCustom.cmake b/cMake/UseLibPackCustom.cmake
@@ -67,10 +67,10 @@ set(SMESH_LIBRARIES
 set(SMESH_FOUND TRUE) 
 
 # Coin3D
-find_path(COIN3D_INCLUDE_DIR Inventor/So.h
+find_path(COIN3D_INCLUDE_DIRS Inventor/So.h
 ${FREECAD_LIBPACK_DIR}/include/Coin-2.4.5
 )
-find_path(COIN3D_INCLUDE_DIR Inventor/So.h
+find_path(COIN3D_INCLUDE_DIRS Inventor/So.h
 ${FREECAD_LIBPACK_DIR}/include/Coin-3.1.3
 )
 find_library(COIN3D_LIBRARY_RELEASE coin2
@@ -85,6 +85,8 @@ find_library(COIN3D_LIBRARY_RELEASE coin3
 find_library(COIN3D_LIBRARY_DEBUG coin3d
     "${FREECAD_LIBPACK_DIR}/lib"
 )
+set(COIN3D_LIBRARIES optimized ${COIN3D_LIBRARY_RELEASE}
+                     debug ${COIN3D_LIBRARY_DEBUG})
 
 set(COIN3D_FOUND TRUE) 
 

diff --git a/src/Doc/CMakeLists.txt b/src/Doc/CMakeLists.txt
@@ -18,7 +18,7 @@ if(DOXYGEN_FOUND)
 
     # directory order seems important for correct macro expansion
     # (files containing macros definitions must be parsed before the files using them)
-    SET(DOXYGEN_SOURCE_DIR ${COIN3D_INCLUDE_DIR}/Inventor/fields/SoSubField.h 
+    SET(DOXYGEN_SOURCE_DIR ${COIN3D_INCLUDE_DIRS}/Inventor/fields/SoSubField.h 
                            ${CMAKE_SOURCE_DIR}/src/CXX 
                            ${CMAKE_SOURCE_DIR}/src/zipios++ 
                            ${CMAKE_SOURCE_DIR}/src/3rdParty

diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt
@@ -31,7 +31,7 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}/TaskView
     ${CMAKE_CURRENT_BINARY_DIR}/Quarter
     ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIR}
+    ${COIN3D_INCLUDE_DIRS}
     ${PYTHON_INCLUDE_DIRS}
     ${XercesC_INCLUDE_DIRS}
     ${QT_INCLUDE_DIR}
@@ -42,17 +42,15 @@ include_directories(
 if(MSVC)
     set(FreeCADGui_LIBS
          FreeCADApp
-         debug ${COIN3D_LIBRARY_DEBUG}
-         optimized ${COIN3D_LIBRARY_RELEASE}
+         ${COIN3D_LIBRARIES}
          ${QT_LIBRARIES}
          ${QT_QTUITOOLS_LIBRARY}
          ${OPENGL_gl_LIBRARY}
     )
 else(MSVC)
     set(FreeCADGui_LIBS
-        FreeCADBase
         FreeCADApp
-        ${COIN3D_LIBRARY}
+        ${COIN3D_LIBRARIES}
         ${QT_LIBRARIES}
         ${Boost_LIBRARIES}
         ${OPENGL_gl_LIBRARY}

diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
@@ -4,7 +4,7 @@
 if(BUILD_GUI)
     include_directories(
         ${Boost_INCLUDE_DIRS}
-        ${COIN3D_INCLUDE_DIR}
+        ${COIN3D_INCLUDE_DIRS}
         ${ZLIB_INCLUDE_DIR}
         ${QT_INCLUDE_DIR}
         ${PYTHON_INCLUDE_DIRS}

diff --git a/src/Mod/Complete/Gui/CMakeLists.txt b/src/Mod/Complete/Gui/CMakeLists.txt
@@ -1,7 +1,7 @@
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIR}
+    ${COIN3D_INCLUDE_DIRS}
     ${QT_INCLUDE_DIR}
     ${ZLIB_INCLUDE_DIR}
     ${PYTHON_INCLUDE_DIRS}

diff --git a/src/Mod/Drawing/Gui/CMakeLists.txt b/src/Mod/Drawing/Gui/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/src
     ${CMAKE_CURRENT_BINARY_DIR}
     ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIR}
+    ${COIN3D_INCLUDE_DIRS}
     ${PYTHON_INCLUDE_DIRS}
     ${QT_INCLUDE_DIR}
     ${OCC_INCLUDE_DIR}

diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/src
     ${CMAKE_CURRENT_BINARY_DIR}
     ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIR}
+    ${COIN3D_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}
     ${OCC_INCLUDE_DIR}
     ${QT_INCLUDE_DIR}

diff --git a/src/Mod/Image/Gui/CMakeLists.txt b/src/Mod/Image/Gui/CMakeLists.txt
@@ -7,7 +7,7 @@ endif(OPENCV2_FOUND)
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIR}
+    ${COIN3D_INCLUDE_DIRS}
     ${OPENCV2_INCLUDE_DIR}
     ${QT_INCLUDE_DIR}
     ${ZLIB_INCLUDE_DIR}

diff --git a/src/Mod/Import/Gui/CMakeLists.txt b/src/Mod/Import/Gui/CMakeLists.txt
@@ -10,7 +10,7 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${Boost_INCLUDE_DIRS}
     ${OCC_INCLUDE_DIR}
-    ${COIN3D_INCLUDE_DIR}
+    ${COIN3D_INCLUDE_DIRS}
     ${QT_INCLUDE_DIR}
     ${ZLIB_INCLUDE_DIR}
     ${PYTHON_INCLUDE_DIRS}

diff --git a/src/Mod/Inspection/Gui/CMakeLists.txt b/src/Mod/Inspection/Gui/CMakeLists.txt
@@ -2,7 +2,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/src
     ${CMAKE_CURRENT_BINARY_DIR}
     ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIR}
+    ${COIN3D_INCLUDE_DIRS}
     ${QT_INCLUDE_DIR}
     ${PYTHON_INCLUDE_DIRS}
     ${XercesC_INCLUDE_DIRS}

diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt
@@ -1,7 +1,7 @@
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIR}
+    ${COIN3D_INCLUDE_DIRS}
     ${PYTHON_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}
     ${QT_INCLUDE_DIR}

diff --git a/src/Mod/MeshPart/Gui/CMakeLists.txt b/src/Mod/MeshPart/Gui/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${Boost_INCLUDE_DIRS}
     ${OCC_INCLUDE_DIR}
-    ${COIN3D_INCLUDE_DIR}
+    ${COIN3D_INCLUDE_DIRS}
     ${QT_INCLUDE_DIR}
     ${ZLIB_INCLUDE_DIR}
     ${PYTHON_INCLUDE_DIRS}

diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt
@@ -10,7 +10,7 @@ include_directories(
     ${CMAKE_BINARY_DIR}/src
     ${CMAKE_CURRENT_BINARY_DIR}
     ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIR}
+    ${COIN3D_INCLUDE_DIRS}
     ${OCC_INCLUDE_DIR}
     ${PYTHON_INCLUDE_DIRS}
     ${QT_INCLUDE_DIR}

diff --git a/src/Mod/PartDesign/Gui/CMakeLists.txt b/src/Mod/PartDesign/Gui/CMakeLists.txt
@@ -10,7 +10,7 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${Boost_INCLUDE_DIRS}
     ${OCC_INCLUDE_DIR}
-    ${COIN3D_INCLUDE_DIR}
+    ${COIN3D_INCLUDE_DIRS}
     ${QT_INCLUDE_DIR}
     ${ZLIB_INCLUDE_DIR}
     ${PYTHON_INCLUDE_DIRS}

diff --git a/src/Mod/Path/Gui/CMakeLists.txt b/src/Mod/Path/Gui/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/src
     ${CMAKE_CURRENT_BINARY_DIR}
     ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIR}
+    ${COIN3D_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}
     ${OCC_INCLUDE_DIR}
     ${QT_INCLUDE_DIR}

diff --git a/src/Mod/Points/Gui/CMakeLists.txt b/src/Mod/Points/Gui/CMakeLists.txt
@@ -6,7 +6,7 @@ endif(PCL_FOUND)
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIR}
+    ${COIN3D_INCLUDE_DIRS}
     ${PYTHON_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}
     ${QT_INCLUDE_DIR}

diff --git a/src/Mod/Raytracing/Gui/CMakeLists.txt b/src/Mod/Raytracing/Gui/CMakeLists.txt
@@ -10,7 +10,7 @@ include_directories(
     ${CMAKE_BINARY_DIR}/src
     ${CMAKE_CURRENT_BINARY_DIR}
     ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIR}
+    ${COIN3D_INCLUDE_DIRS}
     ${OCC_INCLUDE_DIR}
     ${PYTHON_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}

diff --git a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
@@ -10,7 +10,7 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${Boost_INCLUDE_DIRS}
     ${OCC_INCLUDE_DIR}
-    ${COIN3D_INCLUDE_DIR}
+    ${COIN3D_INCLUDE_DIRS}
     ${QT_INCLUDE_DIR}
     ${PYTHON_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}