[CMake] mini_required 2.6->3.5 and fix CXX_VERSION variable passed from cmd

This commit is contained in:
yanyiwu 2024-07-27 19:24:57 +08:00
parent 732fec41e6
commit f8d063101c

View File

@ -1,7 +1,6 @@
CMAKE_MINIMUM_REQUIRED (VERSION 3.5)
PROJECT(CPPJIEBA) PROJECT(CPPJIEBA)
CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/deps/limonp/include INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/deps/limonp/include
${PROJECT_SOURCE_DIR}/include) ${PROJECT_SOURCE_DIR}/include)
@ -9,12 +8,14 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set (CMAKE_INSTALL_PREFIX "/usr/local/cppjieba" CACHE PATH "default install path" FORCE ) set (CMAKE_INSTALL_PREFIX "/usr/local/cppjieba" CACHE PATH "default install path" FORCE )
endif() endif()
ADD_DEFINITIONS(-O3 -Wall -g) if(NOT DEFINED CMAKE_CXX_STANDARD)
IF(APPLE) # mac os set(CMAKE_CXX_STANDARD 11)
ADD_DEFINITIONS(-std=c++0x)
endif() endif()
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
ADD_DEFINITIONS(-O3 -Wall -g)
ADD_SUBDIRECTORY(deps)
ADD_SUBDIRECTORY(test) ADD_SUBDIRECTORY(test)
ENABLE_TESTING() ENABLE_TESTING()