+ make area build with LibPack

Frank0587 · Jul 24, 2015 · 2bbbeaa · 2bbbeaa
1 parent b045896
commit 2bbbeaa
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 7 deletions.
diff --git a/cMake/UseLibPack10x.cmake b/cMake/UseLibPack10x.cmake
@@ -13,6 +13,7 @@ set(OPENGL_gl_LIBRARY opengl32 glu32)
 # Python
 set(PYTHON_LIBRARIES optimized python27.lib debug python27_d.lib)
 set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/Python-2.7.5)
+set(PYTHON_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/Python-2.7.5)
 set(PYTHON_EXECUTABLE   ${FREECAD_LIBPACK_DIR}/bin/python.exe)
 set(PYTHONLIBS_FOUND TRUE)
 

diff --git a/cMake/UseLibPack6x.cmake b/cMake/UseLibPack6x.cmake
@@ -13,6 +13,7 @@ set(OPENGL_gl_LIBRARY opengl32 glu32)
 # Python
 set(PYTHON_LIBRARIES optimized python25.lib debug python25_d.lib)
 set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/python)
+set(PYTHON_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/python)
 set(PYTHON_EXECUTABLE   ${FREECAD_LIBPACK_DIR}/bin/python.exe)
 set(PYTHONLIBS_FOUND TRUE) 
 

diff --git a/cMake/UseLibPack7x.cmake b/cMake/UseLibPack7x.cmake
@@ -13,6 +13,7 @@ set(OPENGL_gl_LIBRARY opengl32 glu32)
 # Python
 set(PYTHON_LIBRARIES optimized python26.lib debug python26_d.lib)
 set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/python)
+set(PYTHON_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/python)
 set(PYTHON_EXECUTABLE   ${FREECAD_LIBPACK_DIR}/bin/python.exe)
 set(PYTHONLIBS_FOUND TRUE) 
 

diff --git a/cMake/UseLibPack8x.cmake b/cMake/UseLibPack8x.cmake
@@ -13,6 +13,7 @@ set(OPENGL_gl_LIBRARY opengl32 glu32)
 # Python
 set(PYTHON_LIBRARIES optimized python26.lib debug python26_d.lib)
 set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/python)
+set(PYTHON_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/python)
 set(PYTHON_EXECUTABLE   ${FREECAD_LIBPACK_DIR}/bin/python.exe)
 set(PYTHONLIBS_FOUND TRUE) 
 

diff --git a/cMake/UseLibPack9x.cmake b/cMake/UseLibPack9x.cmake
@@ -13,6 +13,7 @@ set(OPENGL_gl_LIBRARY opengl32 glu32)
 # Python
 set(PYTHON_LIBRARIES optimized python27.lib debug python27_d.lib)
 set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/Python-2.7.6)
+set(PYTHON_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/Python-2.7.6)
 set(PYTHON_EXECUTABLE   ${FREECAD_LIBPACK_DIR}/bin/python.exe)
 set(PYTHONLIBS_FOUND TRUE) 
 

diff --git a/cMake/UseLibPackCustom.cmake b/cMake/UseLibPackCustom.cmake
@@ -13,6 +13,7 @@ set(OPENGL_gl_LIBRARY opengl32 glu32)
 # Python
 set(PYTHON_LIBRARIES optimized python26.lib debug python26_d.lib)
 set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/Python-2.6.4)
+set(PYTHON_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/Python-2.6.4)
 set(PYTHON_EXECUTABLE   ${FREECAD_LIBPACK_DIR}/bin/python.exe)
 set(PYTHONLIBS_FOUND TRUE) 
 

diff --git a/src/Mod/Path/libarea/CMakeLists.txt b/src/Mod/Path/libarea/CMakeLists.txt
@@ -7,14 +7,18 @@ endif (CMAKE_BUILD_TOOL MATCHES "make")
 include_directories(${PYTHON_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-find_package( Boost COMPONENTS python REQUIRED)  # find BOOST and boost-python
-if(Boost_FOUND)
+if(NOT FREECAD_LIBPACK_USE)
+    find_package( Boost COMPONENTS python REQUIRED)  # find BOOST and boost-python
+    if(Boost_FOUND)
+        include_directories(${Boost_INCLUDE_DIRS})
+        MESSAGE(STATUS "found Boost: " ${Boost_LIB_VERSION})
+        MESSAGE(STATUS "boost-incude dirs are: " ${Boost_INCLUDE_DIRS})
+        MESSAGE(STATUS "boost-python lib is: " ${Boost_PYTHON_LIBRARY})
+        MESSAGE(STATUS "boost_LIBRARY_DIRS is: " ${Boost_LIBRARY_DIRS})
+        MESSAGE(STATUS "Boost_LIBRARIES is: " ${Boost_LIBRARIES})
+    endif()
+else()
     include_directories(${Boost_INCLUDE_DIRS})
-    MESSAGE(STATUS "found Boost: " ${Boost_LIB_VERSION})
-    MESSAGE(STATUS "boost-incude dirs are: " ${Boost_INCLUDE_DIRS})
-    MESSAGE(STATUS "boost-python lib is: " ${Boost_PYTHON_LIBRARY})
-    MESSAGE(STATUS "boost_LIBRARY_DIRS is: " ${Boost_LIBRARY_DIRS})
-    MESSAGE(STATUS "Boost_LIBRARIES is: " ${Boost_LIBRARIES})    
 endif()
 
 # this defines the source-files for library