build: Made solo5 optional (WITH_SOLO5). Always ON (except Mac). Solves #1399

Author: AndreasAakesson

CMakeLists.txt

@@ -17,6 +17,8 @@ set(CMAKE_C_COMPILER_TARGET ${TRIPLE})
 
 message(STATUS "Target triple ${TRIPLE}")
 
+option(WITH_SOLO5 "Install with solo5 support" ON)
+
 set(CMAKE_TOOLCHAIN_FILE ${INCLUDEOS_ROOT}/cmake/${ARCH}-elf-toolchain.cmake)
 
 project (includeos C CXX)

cmake/cross_compiled_libraries.txt

@@ -28,6 +28,7 @@ else(BUNDLE_LOC)
 
 endif (BUNDLE_LOC)
 
+if (WITH_SOLO5)
 ExternalProject_Add(solo5_repo
 	PREFIX precompiled
 	BUILD_IN_SOURCE 1
@@ -57,6 +58,13 @@ add_dependencies(ukvm-bin solo5_repo)
 # Some OS components depend on solo5 (for solo5.h for example)
 add_dependencies(PrecompiledLibraries solo5)
 
+# Only x86_64 supported at the moment
+if ("${ARCH}" STREQUAL "x86_64")
+  install(FILES ${SOLO5_LIB_DIR}/ukvm/solo5.o ${SOLO5_LIB_DIR}/ukvm/ukvm-bin DESTINATION includeos/${ARCH}/lib)
+endif()
+
+endif (WITH_SOLO5)
+
 set(PRECOMPILED_DIR ${CMAKE_CURRENT_BINARY_DIR}/precompiled/src/PrecompiledLibraries/${ARCH})
 
 set(LIBCXX_INCLUDE_DIR ${PRECOMPILED_DIR}/libcxx/include/)
@@ -95,9 +103,4 @@ install(DIRECTORY ${SOLO5_INCLUDE_DIR} DESTINATION includeos/${ARCH}/include/sol
 
 install(FILES ${CRTEND} ${CRTBEGIN} DESTINATION includeos/${ARCH}/lib)
 
-# Only x86_64 supported at the moment
-if ("${ARCH}" STREQUAL "x86_64")
-  install(FILES ${SOLO5_LIB_DIR}/ukvm/solo5.o ${SOLO5_LIB_DIR}/ukvm/ukvm-bin DESTINATION includeos/${ARCH}/lib)
-endif()
-
 install(FILES ${NEWLIB_LIB_DIR}/libc.a ${NEWLIB_LIB_DIR}/libg.a ${NEWLIB_LIB_DIR}/libm.a ${LIBGCC_LIB_DIR}/libgcc.a ${LIBCXX_LIB_DIR}/libc++.a ${LIBCXX_LIB_DIR}/libc++abi.a DESTINATION includeos/${ARCH}/lib)

cmake/i686-elf-toolchain.cmake

@@ -41,4 +41,7 @@ set(CMAKE_FIND_ROOT_PATH ${INCLUDEOS_BIN})
 
 # Set nasm compiler to the one symlinked in includeos/bin (to avoid running Mac one)
 set(CMAKE_ASM_NASM_COMPILER ${INCLUDEOS_BIN}/nasm)
+
+# Disable solo5
+set(WITH_SOLO5 OFF CACHE BOOL "Install with solo5 support" FORCE)
 endif()

cmake/x86_64-elf-toolchain.cmake

@@ -41,4 +41,7 @@ set(CMAKE_FIND_ROOT_PATH ${INCLUDEOS_BIN})
 
 # Set nasm compiler to the one symlinked in includeos/bin (to avoid running Mac one)
 set(CMAKE_ASM_NASM_COMPILER ${INCLUDEOS_BIN}/nasm)
+
+# Disable solo5
+set(WITH_SOLO5 OFF CACHE BOOL "Install with solo5 support" FORCE)
 endif()

src/CMakeLists.txt

@@ -76,7 +76,9 @@ add_dependencies(os PrecompiledLibraries botan)
 add_subdirectory(arch/${ARCH})
 add_subdirectory(platform/x86_pc)
 add_subdirectory(platform/x86_nano)
+if(WITH_SOLO5)
 add_subdirectory(platform/x86_solo5)
+endif(WITH_SOLO5)
 add_subdirectory(drivers)
 add_subdirectory(plugins)
 

src/drivers/CMakeLists.txt

@@ -22,16 +22,18 @@ add_dependencies(silent_start PrecompiledLibraries)
 add_library(vga_output STATIC vgaout.cpp)
 add_dependencies(vga_output PrecompiledLibraries)
 
-add_library(solo5blk STATIC solo5blk.cpp)
-add_dependencies(solo5blk PrecompiledLibraries)
-
-add_library(solo5net STATIC solo5net.cpp)
-add_dependencies(solo5net PrecompiledLibraries)
-
 install(TARGETS
     virtionet virtioblk
-    solo5net solo5blk
     vmxnet3
     heap_debugging
     silent_start vga_output
     DESTINATION includeos/${ARCH}/drivers)
+
+if(WITH_SOLO5)
+  add_library(solo5blk STATIC solo5blk.cpp)
+  add_dependencies(solo5blk PrecompiledLibraries)
+
+  add_library(solo5net STATIC solo5net.cpp)
+  add_dependencies(solo5net PrecompiledLibraries)
+  install(TARGETS solo5net solo5blk DESTINATION includeos/${ARCH}/drivers)
+endif(WITH_SOLO5)