diff --git a/cmake/cpp.cmake b/cmake/cpp.cmake
index 40e99bbd10..7ca7b9e9cf 100644
--- a/cmake/cpp.cmake
+++ b/cmake/cpp.cmake
@@ -1,7 +1,3 @@
-if(NOT BUILD_CXX)
-	return()
-endif()
-
 include(utils)
 set_version(VERSION)
 project(ortools LANGUAGES CXX VERSION ${VERSION})
@@ -53,11 +49,7 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
 find_package(Threads REQUIRED)
 
 # Main Target
-if(BUILD_SHARED_LIBS)
-	add_library(${PROJECT_NAME} SHARED "")
-else()
-	add_library(${PROJECT_NAME} STATIC "")
-endif()
+add_library(${PROJECT_NAME} "")
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11)
 if(NOT APPLE)
 	set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
diff --git a/ortools/algorithms/CMakeLists.txt b/ortools/algorithms/CMakeLists.txt
index 1ec19fc184..ad5bad3512 100644
--- a/ortools/algorithms/CMakeLists.txt
+++ b/ortools/algorithms/CMakeLists.txt
@@ -1,16 +1,20 @@
 file(GLOB _SRCS "*.h" "*.cc")
-list(REMOVE_ITEM _SRCS ${CMAKE_CURRENT_SOURCE_DIR}/hungarian_test.cc
-	${CMAKE_CURRENT_SOURCE_DIR}/hungarian_test.h)
+list(REMOVE_ITEM _SRCS
+  ${CMAKE_CURRENT_SOURCE_DIR}/hungarian_test.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/hungarian_test.h
+)
 
 set(NAME ${PROJECT_NAME}_algorithms)
 
 # Will be merge in libortools.so
 #add_library(${NAME} STATIC ${_SRCS})
 add_library(${NAME} OBJECT ${_SRCS})
-set_target_properties(${NAME} PROPERTIES CXX_STANDARD 11)
-set_target_properties(${NAME} PROPERTIES CXX_STANDARD_REQUIRED ON)
-set_target_properties(${NAME} PROPERTIES CXX_EXTENSIONS OFF)
-set_target_properties(${NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+set_target_properties(${NAME} PROPERTIES
+  CXX_STANDARD 11
+  CXX_STANDARD_REQUIRED ON
+  CXX_EXTENSIONS OFF
+  POSITION_INDEPENDENT_CODE ON
+)
 target_include_directories(${NAME} PRIVATE
 	${PROJECT_SOURCE_DIR}
 	${PROJECT_BINARY_DIR}