diff options
| author | DichenZhang1 <140119224+DichenZhang1@users.noreply.github.com> | 2023-10-04 16:32:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-04 16:32:53 -0700 |
| commit | 19cc6a5e721902f136c0929e9aad154e90cc0f25 (patch) | |
| tree | 0d3a81ba5f1d7288d65f546b9fa7c5a786eb82f3 | |
| parent | f923f44d0347a0efd46c44002c5342a46f13651c (diff) | |
| parent | 9d4744d631e73d7d20d098354c2386e944593549 (diff) | |
| download | libultrahdr-19cc6a5e721902f136c0929e9aad154e90cc0f25.tar.gz | |
Merge pull request #15 from ittiam-systems/32bit
cmake: Fix 32-bit cross compilation
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | third_party/cmake/image_io/CMakeLists.txt | 11 |
2 files changed, 0 insertions, 20 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 57601a5..08bfedd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,15 +35,6 @@ include(ExternalProject) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -# Check the target architecture and set compiler flags accordingly -if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") - # 64-bit architecture - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -m64") -else() - # 32-bit architecture - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -m32") -endif() - set(SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}") include("${SRC_DIR}/utils.cmake") diff --git a/third_party/cmake/image_io/CMakeLists.txt b/third_party/cmake/image_io/CMakeLists.txt index a13bcdb..d3ca8f1 100644 --- a/third_party/cmake/image_io/CMakeLists.txt +++ b/third_party/cmake/image_io/CMakeLists.txt @@ -20,17 +20,6 @@ project(IMAGE_IO VERSION 1.0.0) set(CMAKE_CXX_STANDARD 17) -# Check the target architecture and set compiler flags accordingly -if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") - # 64-bit architecture - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -m64") -else() - # 32-bit architecture - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -m32") -endif() - set(IMAGE_IO_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../image_io") file(GLOB IMAGE_IO_SRC "${IMAGE_IO_DIR}/src/**/*.cc") |