merge conflict

Author: galabovaa

highs/CMakeLists.txt

@@ -249,35 +249,6 @@ else()
   if(COMPILER_SUPPORTS_INVALID_OFFSET)
       target_compile_options(highs PUBLIC "$<$<COMPILE_LANGUAGE:CXX>:-Wno-invalid-offsetof>")
   endif()
-<<<<<<< HEAD:src/CMakeLists.txt
-
-  # Configure the config file for the build tree:
-  # Either list all the src/* directories here, or put explicit paths in all the
-  # include statements.
-  # M reckons that the latter is more transparent, and I'm inclined to agree.
-  set(CONF_INCLUDE_DIRS "${HIGHS_SOURCE_DIR}/src" "${HIGHS_BINARY_DIR}")
-  configure_file(${HIGHS_SOURCE_DIR}/highs-config.cmake.in
-    "${HIGHS_BINARY_DIR}/highs-config.cmake" @ONLY)
-
-  # Configure the config file for the install
-  set(CONF_INCLUDE_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../../../${CMAKE_INSTALL_INCLUDEDIR}")
-  configure_file(${HIGHS_SOURCE_DIR}/highs-config.cmake.in
-    "${HIGHS_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/highs-config.cmake" @ONLY)
-
-  # Configure the pkg-config file for the install
-  configure_file(${HIGHS_SOURCE_DIR}/highs.pc.in
-    "${HIGHS_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/highs.pc" @ONLY)
-
-  # Install the targets of the highs export group, the config file so that other
-  # cmake-projects can link easily against highs, and the pkg-config flie so that
-  # other projects can easily build against highs
-  install(FILES "${HIGHS_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/highs-config.cmake"
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/highs)
-  install(FILES "${HIGHS_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/highs.pc"
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-
-=======
->>>>>>> latest:highs/CMakeLists.txt
 
   if (BUILD_DOTNET)