Fixed CMake for for Octave

This commit is contained in:
Ian Bell
2014-07-27 23:33:38 +02:00
parent 5d3fa2761c
commit fa25d1b4c0

View File

@@ -198,13 +198,10 @@ if (COOLPROP_OCTAVE_MODULE)
# Make a src directory to deal with file permissions problem with MinGW makefile
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/src)
# Search for static libraries
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
# Find the required libraries
find_library(OCTAVE_LIB liboctave.a PATHS ${OCTAVE_LINK_DIRS})
find_library(OCTINTERP_LIB liboctinterp.a PATHS ${OCTAVE_LINK_DIRS})
find_library(CRUFT_LIB libcruft.a PATHS ${OCTAVE_LINK_DIRS})
find_library(OCTAVE_LIB octave PATHS ${OCTAVE_LINK_DIRS})
find_library(OCTINTERP_LIB octinterp PATHS ${OCTAVE_LINK_DIRS})
find_library(CRUFT_LIB cruft PATHS ${OCTAVE_LINK_DIRS})
message(STATUS "OCTAVE_LIB=${OCTAVE_LIB}")
message(STATUS "OCTINTERP_LIB=${OCTINTERP_LIB}")
@@ -226,6 +223,10 @@ if (COOLPROP_OCTAVE_MODULE)
else()
SWIG_LINK_LIBRARIES(CoolProp ${OCTAVE_LIB} ${OCTINTERP_LIB})
endif()
if (OSX)
set_target_properties(CoolProp PROPERTIES LINK_FLAGS "-stdlib=libc++")
endif()
set_target_properties(CoolProp PROPERTIES SUFFIX ".oct" PREFIX "")
add_dependencies (${app_name} generate_headers)