diff --git a/cmake/cpp.cmake b/cmake/cpp.cmake
index 96268ae019..a37bf0473a 100644
--- a/cmake/cpp.cmake
+++ b/cmake/cpp.cmake
@@ -15,28 +15,35 @@ if(NOT BUILD_CXX)
   return()
 endif()
 
-# Basic type
-include(CMakePushCheckState)
-cmake_push_check_state(RESET)
-set(CMAKE_EXTRA_INCLUDE_FILES "cstdint")
-include(CheckTypeSize)
-check_type_size("long" SIZEOF_LONG LANGUAGE CXX)
-message(STATUS "Found long size: ${SIZEOF_LONG}")
-check_type_size("long long" SIZEOF_LONG_LONG LANGUAGE CXX)
-message(STATUS "Found long long size: ${SIZEOF_LONG_LONG}")
-check_type_size("int64_t" SIZEOF_INT64_T LANGUAGE CXX)
-message(STATUS "Found int64_t size: ${SIZEOF_INT64_T}")
+# Check primitive types
+option(CHECK_TYPE "Check primitive type size" OFF)
+if(CHECK_TYPE)
+  include(CMakePushCheckState)
+  cmake_push_check_state(RESET)
+  set(CMAKE_EXTRA_INCLUDE_FILES "cstdint")
+  include(CheckTypeSize)
+  check_type_size("long" SIZEOF_LONG LANGUAGE CXX)
+  message(STATUS "Found long size: ${SIZEOF_LONG}")
+  check_type_size("long long" SIZEOF_LONG_LONG LANGUAGE CXX)
+  message(STATUS "Found long long size: ${SIZEOF_LONG_LONG}")
+  check_type_size("int64_t" SIZEOF_INT64_T LANGUAGE CXX)
+  message(STATUS "Found int64_t size: ${SIZEOF_INT64_T}")
 
-check_type_size("unsigned long" SIZEOF_ULONG LANGUAGE CXX)
-message(STATUS "Found unsigned long size: ${SIZEOF_ULONG}")
-check_type_size("unsigned long long" SIZEOF_ULONG_LONG LANGUAGE CXX)
-message(STATUS "Found unsigned long long size: ${SIZEOF_ULONG_LONG}")
-check_type_size("uint64_t" SIZEOF_UINT64_T LANGUAGE CXX)
-message(STATUS "Found uint64_t size: ${SIZEOF_UINT64_T}")
+  check_type_size("unsigned long" SIZEOF_ULONG LANGUAGE CXX)
+  message(STATUS "Found unsigned long size: ${SIZEOF_ULONG}")
+  check_type_size("unsigned long long" SIZEOF_ULONG_LONG LANGUAGE CXX)
+  message(STATUS "Found unsigned long long size: ${SIZEOF_ULONG_LONG}")
+  check_type_size("uint64_t" SIZEOF_UINT64_T LANGUAGE CXX)
+  message(STATUS "Found uint64_t size: ${SIZEOF_UINT64_T}")
 
-check_type_size("int *" SIZEOF_INT_P LANGUAGE CXX)
-message(STATUS "Found int * size: ${SIZEOF_INT_P}")
-cmake_pop_check_state()
+  check_type_size("int *" SIZEOF_INT_P LANGUAGE CXX)
+  message(STATUS "Found int * size: ${SIZEOF_INT_P}")
+  check_type_size("intptr_t" SIZEOF_INTPTR_T LANGUAGE CXX)
+  message(STATUS "Found intptr_t size: ${SIZEOF_INTPTR_T}")
+  check_type_size("uintptr_t" SIZEOF_UINTPTR_T LANGUAGE CXX)
+  message(STATUS "Found uintptr_t size: ${SIZEOF_UINTPTR_T}")
+  cmake_pop_check_state()
+endif()
 
 #############
 ##  FLAGS  ##
@@ -632,7 +639,8 @@ install(TARGETS ${PROJECT_NAME}
 
 install(EXPORT ${PROJECT_NAME}Targets
   NAMESPACE ${PROJECT_NAMESPACE}::
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+  COMPONENT Devel)
 install(DIRECTORY ortools
   TYPE INCLUDE
   COMPONENT Devel