Merge pull request #186 from unknownbrackets/cmake

Allow CMake 3.10.x for Bionic Beaver

CMakeLists.txt

@@ -1,9 +1,10 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.10)
 project(armips) 
 
 option(ARMIPS_PRECOMPILE_HEADERS "Use precompiled headers" OFF)
 option(ARMIPS_REGEXP "Enable regexp expression functions" ON)
 option(ARMIPS_USE_STD_FILESYSTEM "Use std::filesystem instead of third party implementation" OFF)
+option(ARMIPS_LIBRARY_ONLY "Build libarmips, skip building armips and armipstests binaries" OFF)
 
 macro(check_compiler VARIABLE NAME)
 	if (${CMAKE_CXX_COMPILER_ID} MATCHES ${NAME})
@@ -23,7 +24,7 @@ function(init_target TARGET_NAME)
 		CXX_STANDARD_REQUIRED TRUE
 		CXX_EXTENSIONS FALSE)
 
-	target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+	target_include_directories(${TARGET_NAME} BEFORE PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 	if (GCC OR CLANG)
 		# clang-cl seems to treat -Wall as -Weverything
@@ -51,7 +52,7 @@ function(init_target TARGET_NAME)
 			target_compile_definitions(${TARGET_NAME} PRIVATE _CRT_SECURE_NO_WARNINGS)
 		else()
 			target_compile_options(${TARGET_NAME} PRIVATE -municode)
-			target_link_options(${TARGET_NAME} PRIVATE -municode)
+			set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS "-municode")
 		endif()
 	endif()
 endfunction()
@@ -210,37 +211,39 @@ if (ARMIPS_PRECOMPILE_HEADERS)
 	endif()
 endif()
 
-# armips-bin
-add_executable(armips-bin)
-init_target(armips-bin)
-set_target_properties(armips-bin PROPERTIES OUTPUT_NAME armips)
-target_link_libraries(armips-bin PRIVATE armips)
-
-armips_target_sources(armips-bin PRIVATE
-	Main/CommandLineInterface.cpp
-	Main/CommandLineInterface.h
-	Main/main.cpp
-	Main/Tests.cpp
-	Main/Tests.h
-)
+if(NOT ARMIPS_LIBRARY_ONLY)
+	# armips-bin
+	add_executable(armips-bin "")
+	init_target(armips-bin)
+	set_target_properties(armips-bin PROPERTIES OUTPUT_NAME armips)
+	target_link_libraries(armips-bin PRIVATE armips)
+
+	armips_target_sources(armips-bin PRIVATE
+		Main/CommandLineInterface.cpp
+		Main/CommandLineInterface.h
+		Main/main.cpp
+		Main/Tests.cpp
+		Main/Tests.h
+	)
 
-# tests
-add_executable(armipstests)
-init_target(armipstests)
-target_compile_definitions(armipstests PUBLIC ARMIPS_TESTS)
-target_link_libraries(armipstests PRIVATE armips)
-
-armips_target_sources(armipstests PRIVATE
-	Main/CommandLineInterface.cpp
-	Main/CommandLineInterface.h
-	Main/main.cpp
-	Main/Tests.cpp
-	Main/Tests.h
-)
+	# tests
+	add_executable(armipstests "")
+	init_target(armipstests)
+	target_compile_definitions(armipstests PUBLIC ARMIPS_TESTS)
+	target_link_libraries(armipstests PRIVATE armips)
+
+	armips_target_sources(armipstests PRIVATE
+		Main/CommandLineInterface.cpp
+		Main/CommandLineInterface.h
+		Main/main.cpp
+		Main/Tests.cpp
+		Main/Tests.h
+	)
 
-enable_testing()
-add_test(NAME armipstests COMMAND armipstests ${CMAKE_CURRENT_SOURCE_DIR}/Tests)
+	enable_testing()
+	add_test(NAME armipstests COMMAND armipstests ${CMAKE_CURRENT_SOURCE_DIR}/Tests)
 
-# install
-install(TARGETS armips-bin RUNTIME DESTINATION .)
-install(FILES Readme.md DESTINATION .)
+	# install
+	install(TARGETS armips-bin RUNTIME DESTINATION .)
+	install(FILES Readme.md DESTINATION .)
+endif()