--- CMakeModules/FindLIBCOMBINE.orig.cmake 2018-07-30 20:03:33.000000000 +0200
+++ CMakeModules/FindLIBCOMBINE.cmake 2018-07-31 22:08:43.379406760 +0200
@@ -27,7 +27,7 @@
set(COMBINE_LIBRARY_NAME)
if (UNIX)
- set(COMBINE_LIBRARY_NAME Combine-static)
+ set(COMBINE_LIBRARY_NAME Combine)
else()
set(COMBINE_LIBRARY_NAME libCombine-static)
endif()
@@ -70,8 +70,7 @@
# Fallback if no CONFIG is found
find_path(COMBINE_INCLUDE_DIR combine/combinearchive.h
- PATHS $ENV{COMBINE_DIR}/include
- $ENV{COMBINE_DIR}
+ PATHS ${INCLUDE_INSTALL_DIR}
${COPASI_DEPENDENCY_DIR}/include
${COPASI_DEPENDENCY_DIR}
~/Library/Frameworks
@@ -95,7 +94,7 @@
NAMES ${COMBINE_LIBRARY_NAME}
PATHS $ENV{COMBINE_DIR}/lib
$ENV{COMBINE_DIR}
- ${COPASI_DEPENDENCY_DIR}/${CMAKE_INSTALL_LIBDIR}
+ ${CMAKE_INSTALL_LIBDIR}
${COPASI_DEPENDENCY_DIR}/lib
${COPASI_DEPENDENCY_DIR}
~/Library/Frameworks