Blob Blame History Raw
--- CMakeModules/FindLIBCOMBINE.orig.cmake	2018-07-30 20:03:33.000000000 +0200
+++ CMakeModules/FindLIBCOMBINE.cmake	2018-07-31 22:08:43.379406760 +0200
@@ -26,7 +26,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()
@@ -68,8 +68,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
@@ -93,7 +92,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}
           ${CONAN_LIB_DIRS_LIBCOMBINE}