改进使用方式,增加use_cm_module.cmake

This commit is contained in:
hyzboy 2019-08-22 11:26:59 +08:00
parent f8a3ff0879
commit 125cccb9c7
5 changed files with 109 additions and 108 deletions

View File

@ -1,6 +1,4 @@
macro(set_compiler_param) IF(WIN32)
IF(WIN32)
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MDd") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MDd")
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd") SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
@ -43,5 +41,3 @@
MESSAGE("C++ Compiler: " ${CMAKE_CXX_COMPILER}) MESSAGE("C++ Compiler: " ${CMAKE_CXX_COMPILER})
MESSAGE("C Flag: " ${CMAKE_C_FLAGS}) MESSAGE("C Flag: " ${CMAKE_C_FLAGS})
MESSAGE("C++ Flag: " ${CMAKE_CXX_FLAGS}) MESSAGE("C++ Flag: " ${CMAKE_CXX_FLAGS})
endmacro()

View File

@ -1,6 +1,4 @@
macro(set_output_directory) IF(ANDROID)
IF(ANDROID)
SET(OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/out/android/${ANDROID_ABI}) SET(OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/out/android/${ANDROID_ABI})
ELSEIF(IOS) ELSEIF(IOS)
SET(OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/out/iOS/${IOS_PLATFORM}) SET(OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/out/iOS/${IOS_PLATFORM})
@ -30,4 +28,3 @@
SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${OUTPUT_DIRECTORY_RELEASE}) SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${OUTPUT_DIRECTORY_RELEASE})
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${OUTPUT_DIRECTORY_RELEASE}) SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${OUTPUT_DIRECTORY_RELEASE})
endmacro()

View File

@ -1,5 +1,3 @@
macro(check_system_bits)
IF(APPLE) IF(APPLE)
SET(HGL_BITS 64) SET(HGL_BITS 64)
ELSE() ELSE()
@ -28,4 +26,3 @@ macro(check_system_bits)
Message("System is ${HGL_BITS} Bit") Message("System is ${HGL_BITS} Bit")
endmacro()

View File

@ -1,5 +1,19 @@
include(compiler)
include(system_bit)
include(version)
include(output_path)
macro(use_cm_module module) macro(use_cm_module module)
add_subdirectory(CM${module}) add_subdirectory(CM${module})
include(CM${module}/path_config.cmake) include(CM${module}/path_config.cmake)
include_directories(CM${module}/inc) include_directories(CM${module}/inc)
endmacro() endmacro()
macro(use_mgl mgl_path)
add_definitions(-DMATH_USE_OPENGL)
add_definitions(-DMATH_RIGHTHANDED_CAMERA)
add_definitions(-DMATH_AVX)
include_directories(${mgl_path}/src)
add_subdirectory(${mgl_path})
endmacro()

View File

@ -1,6 +1,4 @@
macro(check_system_version) message("Host system: " ${CMAKE_HOST_SYSTEM})
message("Host system: " ${CMAKE_HOST_SYSTEM})
message("Host system name: " ${CMAKE_HOST_SYSTEM_NAME}) message("Host system name: " ${CMAKE_HOST_SYSTEM_NAME})
message("Host system version: " ${CMAKE_HOST_SYSTEM_VERSION}) message("Host system version: " ${CMAKE_HOST_SYSTEM_VERSION})
@ -22,4 +20,3 @@
# add_definitions(-DHGL_COMPILE_C_FEATURES="${CMAKE_C_COMPILE_FEATURES}") # add_definitions(-DHGL_COMPILE_C_FEATURES="${CMAKE_C_COMPILE_FEATURES}")
# add_definitions(-DHGL_COMPILE_CXX_FEATURES="${CMAKE_CXX_COMPILE_FEATURES}") # add_definitions(-DHGL_COMPILE_CXX_FEATURES="${CMAKE_CXX_COMPILE_FEATURES}")
endmacro()