Merge pull request #2436 from jschueller/unity

CMake: Add support for UNITY_BUILD

Author: galabovaa

.github/workflows/build-fast.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Configure CMake
         shell: bash
         working-directory: ${{runner.workspace}}/build
-        run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=RELEASE
+        run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_UNITY_BUILD=ON
 
       - name: Build
         working-directory: ${{runner.workspace}}/build
@@ -45,7 +45,7 @@ jobs:
       - name: Configure CMake
         shell: bash
         working-directory: ${{runner.workspace}}/build
-        run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=DEBUG
+        run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_UNITY_BUILD=ON
 
       - name: Build
         working-directory: ${{runner.workspace}}/build

app/CMakeLists.txt

@@ -25,6 +25,7 @@ if(FAST_BUILD)
     endif()
 
     set_target_properties(highs-bin PROPERTIES OUTPUT_NAME highs)
+    set_target_properties(highs-bin PROPERTIES UNITY_BUILD OFF)
 
     target_compile_features(highs-bin PRIVATE cxx_std_11)
     target_link_libraries(highs-bin PRIVATE ${PROJECT_NAMESPACE}::highs)
@@ -78,6 +79,8 @@ else()
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/app>
   )
 
+  set_target_properties(highs PROPERTIES UNITY_BUILD OFF)
+
   # install the binary
   install(TARGETS highs EXPORT highs-targets
     RUNTIME)
@@ -87,4 +90,4 @@ endif()
 if(EMSCRIPTEN AND EMSCRIPTEN_HTML)
   set(CMAKE_EXECUTABLE_SUFFIX ".html")
   set_target_properties(highs PROPERTIES LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/highs_webdemo_shell.html)
-endif()
+endif()

check/CMakeLists.txt

@@ -106,6 +106,8 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
 
   add_executable(unit_tests ${TEST_SOURCES})
 
+  set_target_properties(unit_tests PROPERTIES UNITY_BUILD OFF)
+
   if (UNIX)
       target_compile_options(unit_tests PRIVATE "-Wno-unused-variable")
       target_compile_options(unit_tests PRIVATE "-Wno-unused-const-variable")

cmake/cpp-highs.cmake

@@ -151,6 +151,7 @@ function(highs_cxx_test FILE_NAME)
 
   target_compile_features(${TEST_NAME} PRIVATE cxx_std_11)
   target_link_libraries(${TEST_NAME} PRIVATE ${PROJECT_NAMESPACE}::highs)
+  set_target_properties(${TEST_NAME} PROPERTIES UNITY_BUILD OFF)
 
   # include(GNUInstallDirs)
   # if(APPLE)
@@ -197,6 +198,7 @@ function(highs_c_test FILE_NAME)
 
   target_compile_features(${TEST_NAME} PRIVATE cxx_std_11)
   target_link_libraries(${TEST_NAME} PRIVATE ${PROJECT_NAMESPACE}::highs)
+  set_target_properties(${TEST_NAME} PROPERTIES UNITY_BUILD OFF)
 
   # include(GNUInstallDirs)
   # if(APPLE)

cmake/sources.cmake

@@ -176,6 +176,9 @@ set(ipx_headers
   ipm/ipx/timer.h
   ipm/ipx/utils.h)
 
+# redefinition of 'kHighsInf'
+set_source_files_properties (../extern/filereaderlp/reader.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
+
 set(highs_sources
     ../extern/filereaderlp/reader.cpp
     interfaces/highs_c_api.cpp

highs/ipm/basiclu/lu_list.h

@@ -1,3 +1,6 @@
+#ifndef _LU_LIST_H
+#define _LU_LIST_H
+
 /*
  * lu_list.h
  *
@@ -166,3 +169,5 @@ static inline void lu_list_swap(
         blink[e2next] = e1;
     }
 }
+
+#endif