github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-04-23 03:00:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/coolprop/coolprop

Browse Source
This commit is contained in:
Ian Bell
2014-08-13 21:49:20 +02:00
parent 8a4828bd2e 95c386a94c
commit 83d2dbcda9
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -252,16 +252,13 @@ if (COOLPROP_OCTAVE_MODULE)
set(I_FILE "${CMAKE_SOURCE_DIR}/src/CoolProp.i")
SET_SOURCE_FILES_PROPERTIES(${I_FILE} PROPERTIES CPLUSPLUS ON)
SWIG_ADD_MODULE(CoolProp octave ${I_FILE} ${APP_SOURCES})
if (!OSX)
SWIG_LINK_LIBRARIES(CoolProp ${OCTAVE_OCTAVE_LIB} ${OCTAVE_OCTINTERP_LIB} ${OCTAVE_CRUFT_LIB})
else()
SWIG_LINK_LIBRARIES(CoolProp ${OCTAVE_OCTAVE_LIB} ${OCTAVE_OCTINTERP_LIB})
endif()
SWIG_LINK_LIBRARIES(CoolProp ${OCTAVE_LIBRARIES})
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# We need to see which library to link with on OSX - clang++ or stdc++
execute_process(COMMAND "otool -L ${OCTAVE_LIB} | grep libc++" OUTPUT_VARIABLE COOLPROP_OCTAVE_USING_CLANG)
execute_process(COMMAND "otool -L ${OCTAVE_OCTAVE_LIB} | grep libc++" OUTPUT_VARIABLE COOLPROP_OCTAVE_USING_CLANG)
if ("${COOLPROP_OCTAVE_USING_CLANG} " STREQUAL " ")
message(STATUS "Using -stdlib=libc++")
set_target_properties(CoolProp PROPERTIES LINK_FLAGS "-stdlib=libc++")

24
dev/cmake/Modules/FindOctave.cmake
View File

@@ -151,6 +151,29 @@ else()
message(FATAL_ERROR "Did not find octave-config executable")
endif()
FIND_LIBRARY( OCTAVE_OCTAVE_LIBRARY
NAMES octave liboctave
PATHS ${OCTAVE_LINK_DIRS}
NO_DEFAULT_PATH)
FIND_LIBRARY( OCTAVE_OCTINTERP_LIBRARY
NAMES octinterp liboctinterp
PATHS ${OCTAVE_LINK_DIRS}
NO_DEFAULT_PATH)
FIND_LIBRARY( OCTAVE_CRUFT_LIBRARY
NAMES cruft libcruft
PATHS ${OCTAVE_LINK_DIRS}
NO_DEFAULT_PATH)
SET(OCTAVE_LIBRARIES
${OCTAVE_OCTAVE_LIBRARY}
${OCTAVE_OCTINTERP_LIBRARY})
if (OCTAVE_CRUFT_LIBRARY)
list(APPEND OCTAVE_LIBRARIES ${OCTAVE_CRUFT_LIBRARY})
endif()
message(STATUS "OCTAVE_VERSION=${OCTAVE_VERSION}" )
message(STATUS "OCTAVE_CXXFLAGS=${_mkoctfile_cppflags}" )
message(STATUS "OCTAVE_LINK_FLAGS=${_mkoctfile_ldflags}" )
@@ -159,6 +182,7 @@ message(STATUS "OCTAVE_LINK_DIRS=${_mkoctfile_ldirs}")
message(STATUS "OCTAVE_LIBRARY=${_mkoctfile_libs}")
message(STATUS "OCTAVE_LIBRARY_RELEASE=${OCTAVE_LIBRARY} ")
message(STATUS "OCTAVE_LIBRARY_DEBUG=${OCTAVE_LIBRARY} ")
message(STATUS "OCTAVE_LIBRARIES=${OCTAVE_LIBRARIES} ")
MARK_AS_ADVANCED(
OCTAVE_LIBRARY_FOUND