Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow setting arch to conan_cmake_settings #70

Merged
merged 2 commits into from
Feb 14, 2018
Merged

Allow setting arch to conan_cmake_settings #70

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28455af
Allow setting arch to conan_cmake_settings
bc-lee Jan 30, 2018
018c6d0
Merge branch 'develop' into feature/68_allow_setting_arch_to_conan_cm…
memsharded Jan 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions conan.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ function(conan_cmake_settings result)

message(STATUS "Conan ** WARNING** : This detection of settings from cmake is experimental and incomplete. "
"Please check 'conan.cmake' and contribute")
set(arch "${ARGN}")

if(CONAN_CMAKE_MULTI)
set(_SETTINGS -g cmake_multi)
Expand Down Expand Up @@ -109,6 +110,10 @@ function(conan_cmake_settings result)
message(FATAL_ERROR "Conan: Neither C or C++ was detected as a language for the project. Unabled to detect compiler version.")
endif()

if(arch)
set(_SETTINGS ${_SETTINGS} -s arch=${arch})
endif()

if (${CMAKE_${LANGUAGE}_COMPILER_ID} STREQUAL GNU)
# using GCC
# TODO: Handle other params
Expand Down Expand Up @@ -164,15 +169,17 @@ function(conan_cmake_settings result)
set(_SETTINGS ${_SETTINGS} -s compiler=${_VISUAL} -s compiler.version=${_VISUAL_VERSION})
endif()

if (MSVC_${LANGUAGE}_ARCHITECTURE_ID MATCHES "64")
set(_SETTINGS ${_SETTINGS} -s arch=x86_64)
elseif (MSVC_${LANGUAGE}_ARCHITECTURE_ID MATCHES "^ARM")
message(STATUS "Conan: Using default ARM architecture from MSVC")
set(_SETTINGS ${_SETTINGS} -s arch=armv6)
elseif (MSVC_${LANGUAGE}_ARCHITECTURE_ID MATCHES "86")
set(_SETTINGS ${_SETTINGS} -s arch=x86)
else ()
message(FATAL_ERROR "Conan: Unknown MSVC architecture [${MSVC_${LANGUAGE}_ARCHITECTURE_ID}]")
if(NOT arch)
if (MSVC_${LANGUAGE}_ARCHITECTURE_ID MATCHES "64")
set(_SETTINGS ${_SETTINGS} -s arch=x86_64)
elseif (MSVC_${LANGUAGE}_ARCHITECTURE_ID MATCHES "^ARM")
message(STATUS "Conan: Using default ARM architecture from MSVC")
set(_SETTINGS ${_SETTINGS} -s arch=armv6)
elseif (MSVC_${LANGUAGE}_ARCHITECTURE_ID MATCHES "86")
set(_SETTINGS ${_SETTINGS} -s arch=x86)
else ()
message(FATAL_ERROR "Conan: Unknown MSVC architecture [${MSVC_${LANGUAGE}_ARCHITECTURE_ID}]")
endif()
endif()

conan_cmake_detect_vs_runtime(_vs_runtime)
Expand Down Expand Up @@ -245,7 +252,7 @@ endfunction()

macro(parse_arguments)
set(options BASIC_SETUP CMAKE_TARGETS UPDATE KEEP_RPATHS NO_OUTPUT_DIRS)
set(oneValueArgs CONANFILE DEBUG_PROFILE RELEASE_PROFILE PROFILE)
set(oneValueArgs CONANFILE DEBUG_PROFILE RELEASE_PROFILE PROFILE ARCH)
set(multiValueArgs REQUIRES OPTIONS IMPORTS BUILD CONAN_COMMAND)
cmake_parse_arguments(ARGUMENTS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
endmacro()
Expand Down Expand Up @@ -375,12 +382,12 @@ macro(conan_cmake_run)
conan_cmake_setup_conanfile(${ARGV})
if(CONAN_CMAKE_MULTI)
foreach(CMAKE_BUILD_TYPE "Release" "Debug")
conan_cmake_settings(settings)
conan_cmake_settings(settings ${ARGUMENTS_ARCH})
conan_cmake_install(SETTINGS ${settings} ${ARGV})
endforeach()
set(CMAKE_BUILD_TYPE)
else()
conan_cmake_settings(settings)
conan_cmake_settings(settings ${ARGUMENTS_ARCH})
conan_cmake_install(SETTINGS ${settings} ${ARGV})
endif()
endif()
Expand Down