suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some fixes in build with CL-Bundler

Browse Source
This commit is contained in:
jriegel 2014-11-15 21:18:22 +01:00
parent 8c1b1aa86b
commit 6f907c3b48
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -356,10 +356,10 @@ if(FREECAD_LIBPACK_USE)
ELSEIF(FREECAD_LIBPACK_CHECKCUSTOM) ELSEIF(FREECAD_LIBPACK_CHECKCUSTOM)
set(FREECAD_LIBPACK_VERSION "Custom" CACHE STRING "Displays if the libpack has been found" FORCE) set(FREECAD_LIBPACK_VERSION "Custom" CACHE STRING "Displays if the libpack has been found" FORCE)
include(cMake/UseLibPackCustom.cmake) include(cMake/UseLibPackCustom.cmake)
ELSE(FREECAD_LIBPACK_CHECKFILE6X) ELSE(FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
set(FREECAD_LIBPACK_VERSION "NOTFOUND" CACHE STRING "Displays if the libpack has been found" FORCE) set(FREECAD_LIBPACK_VERSION "NOTFOUND" CACHE STRING "Displays if the libpack has been found" FORCE)
message(SEND_ERROR "Could not find libpack in specified location:" ${FREECAD_LIBPACK_DIR}) message(SEND_ERROR "Could not find libpack in specified location:" ${FREECAD_LIBPACK_DIR})
ENDIF(FREECAD_LIBPACK_CHECKFILE6X) ENDIF(FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
# -------------------------------- PyCXX -------------------------------- # -------------------------------- PyCXX --------------------------------
@ -442,7 +442,7 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
endif() endif()
find_package (OCE QUIET) find_package (OCE QUIET)
if(${OCE_FOUND}) if(${OCE_FOUND})
message("-- OpenCASCADE Community Edition has been found.") message(STATUS "-- OpenCASCADE Community Edition has been found.")
#lib list copied from FreeCAD's FindOpenCasCade.cmake #lib list copied from FreeCAD's FindOpenCasCade.cmake
set(OCC_LIBRARIES set(OCC_LIBRARIES
TKFillet TKFillet
@ -494,8 +494,8 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
if(NOT OCC_FOUND) if(NOT OCC_FOUND)
message("Neither OpenCASCADE Community Edition nor OpenCasCade were found: will not build CAD modules!") message("Neither OpenCASCADE Community Edition nor OpenCasCade were found: will not build CAD modules!")
else() else()
message("-- OpenCASCADE include directory: ${OCC_INCLUDE_PATH}") message(STATUS "-- OpenCASCADE include directory: ${OCC_INCLUDE_PATH}")
message("-- OpenCASCADE shared libraries directory: ${OCC_LIB_PATH}") message(STATUS "-- OpenCASCADE shared libraries directory: ${OCC_LIB_PATH}")
endif() endif()
endif() endif()
@ -649,7 +649,7 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
find_package(Matplotlib) find_package(Matplotlib)
IF(MATPLOTLIB_FOUND) IF(MATPLOTLIB_FOUND)
message("-- matplotlib-${MATPLOTLIB_VERSION} has been found.") message(STATUS "-- matplotlib-${MATPLOTLIB_VERSION} has been found.")
ELSE(MATPLOTLIB_FOUND) ELSE(MATPLOTLIB_FOUND)
message("-- matplotlib not found, Plot module won't be available!") message("-- matplotlib not found, Plot module won't be available!")
ENDIF(MATPLOTLIB_FOUND) ENDIF(MATPLOTLIB_FOUND)

6
src/Base/CMakeLists.txt
View File

@ -21,10 +21,10 @@ if(MSVC)
set(FreeCADBase_LIBS set(FreeCADBase_LIBS
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${Boost_DEBUG_LIBRARIES} ${Boost_DEBUG_LIBRARIES}
${PYTHON_DEBUG_LIBRARY} debug ${PYTHON_DEBUG_LIBRARY}
${PYTHON_LIBRARY} ${PYTHON_LIBRARY}
${XERCESC_DEBUG_LIBRARIES} debug ${XERCESC_DEBUG_LIBRARIES}
${XERCESC_LIBRARIES} optimized ${XERCESC_LIBRARIES}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
debug MSVCRTD.LIB debug MSVCRTD.LIB

2
src/Doc/CMakeLists.txt
View File

@ -4,7 +4,7 @@ if(DOXYGEN_FOUND)
IF (DOXYGEN_DOT_EXECUTABLE) IF (DOXYGEN_DOT_EXECUTABLE)
SET(HAVE_DOT YES) SET(HAVE_DOT YES)
ELSE (DOXYGEN_DOT_EXECUTABLE) ELSE (DOXYGEN_DOT_EXECUTABLE)
message("Note: Doxygen docs will look better with graphviz's dot installed.") message(STATUS "Note: Doxygen docs will look better with graphviz's dot installed.")
SET(HAVE_DOT NO) SET(HAVE_DOT NO)
ENDIF (DOXYGEN_DOT_EXECUTABLE) ENDIF (DOXYGEN_DOT_EXECUTABLE)