78 lines
4.3 KiB
Diff
78 lines
4.3 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index aa593028..8103fef8 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -100,19 +100,19 @@ if (BUILD_CXX)
|
|
message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
|
|
endif()
|
|
|
|
+ # Layout build dir like install dir
|
|
include(GNUInstallDirs)
|
|
-
|
|
if(UNIX)
|
|
option(BUILD_SHARED_LIBS "Build shared libraries (.so or .dyld)." ON)
|
|
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
|
|
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
|
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
|
|
# for multi-config build system (e.g. xcode)
|
|
- foreach(OUTPUTCONFIG IN LISTS CMAKE_CONFIGURATION_TYPES)
|
|
- string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG)
|
|
- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_LIBDIR})
|
|
- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_LIBDIR})
|
|
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_BINDIR})
|
|
+ foreach(OutputConfig IN LISTS CMAKE_CONFIGURATION_TYPES)
|
|
+ string(TOUPPER ${OutputConfig} OUTPUTCONFIG)
|
|
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_LIBDIR})
|
|
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_LIBDIR})
|
|
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_BINDIR})
|
|
endforeach()
|
|
else()
|
|
option(BUILD_SHARED_LIBS "Build shared libraries (.dll)." OFF)
|
|
@@ -120,14 +120,11 @@ if (BUILD_CXX)
|
|
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
|
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
|
|
# for multi-config builds (e.g. msvc)
|
|
- foreach(OUTPUTCONFIG IN LISTS CMAKE_CONFIGURATION_TYPES)
|
|
- string(TOLOWER ${OUTPUTCONFIG} OUTPUTCONFIG)
|
|
- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/${OUTPUTCONFIG})
|
|
- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/${OUTPUTCONFIG})
|
|
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/${OUTPUTCONFIG})
|
|
- # set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_BINDIR})
|
|
- # set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_BINDIR})
|
|
- # set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_BINDIR})
|
|
+ foreach(OutputConfig IN LISTS CMAKE_CONFIGURATION_TYPES)
|
|
+ string(TOUPPER ${OutputConfig} OUTPUTCONFIG)
|
|
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_BINDIR})
|
|
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_BINDIR})
|
|
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_BINDIR})
|
|
endforeach()
|
|
endif()
|
|
|
|
@@ -171,7 +168,7 @@ if (BUILD_CXX)
|
|
check_type_size("int *" SIZEOF_INT_P LANGUAGE CXX)
|
|
message(STATUS "Found int * size: ${SIZEOF_INT_P}")
|
|
cmake_pop_check_state()
|
|
-
|
|
+
|
|
# Use current CMAKE_C_FLAGS and CMAKE_CXX_FLAGS when checking for IPO support,
|
|
# instead of defaults: https://cmake.org/cmake/help/latest/policy/CMP0138.html
|
|
if(MSVC AND BUILD_SHARED_LIBS)
|
|
@@ -189,7 +186,7 @@ if (BUILD_CXX)
|
|
set(ipo_supported NO)
|
|
message(STATUS "IPO / LTO not currently supported building HiGHS on MinGW")
|
|
else()
|
|
- if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
|
|
+ if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
|
|
cmake_policy(SET CMP0138 NEW)
|
|
endif()
|
|
|
|
@@ -320,7 +317,7 @@ if(MSVC)
|
|
add_compile_options("$<$<COMPILE_LANGUAGE:C,CXX>:-D_CRT_SECURE_NO_WARNINGS>")
|
|
add_compile_options("$<$<COMPILE_LANGUAGE:C,CXX>:/MP>")
|
|
|
|
- # Try to split large pdb files into objects.
|
|
+ # Try to split large pdb files into objects.
|
|
# https://github.com/tensorflow/tensorflow/issues/31610
|
|
add_compile_options("/Z7")
|
|
add_link_options("/DEBUG:FASTLINK")
|