modern cmake, improve cmake_compiler_flags (#19145)

crazyhappygame · drelaptop · commit bb54367f960a · 2018-11-07T10:38:40.000+08:00
* cmake_compiler_flags

* Fix typo

* Fix typo2

* Remove chanages from Android.mk
diff --git a/cmake/Modules/CocosConfigDefine.cmake b/cmake/Modules/CocosConfigDefine.cmake
@@ -166,19 +166,6 @@ endfunction()
     if(MSVC)
         target_compile_options(${target}
             PUBLIC /MP
-            PUBLIC /Z7
-            PUBLIC /MD$<$<CONFIG:Debug>:d>
         )
-    else()
-        target_compile_options(${target} 
-            PUBLIC -Wall
-            PUBLIC $<$<CONFIG:Debug>:-g>
-        )
-        if(LINUX)
-            target_compile_options(${target} PUBLIC -pthread)
-        endif()
-    endif()
-    if(ANDROID)
-        target_compile_options(${target} PUBLIC -fsigned-char)
     endif()
  endfunction()
diff --git a/templates/cpp-template-default/proj.android/app/build.gradle b/templates/cpp-template-default/proj.android/app/build.gradle
@@ -35,7 +35,7 @@ android {
                 cmake {
                     targets 'MyGame'
                     arguments "-DCMAKE_FIND_ROOT_PATH=", "-DANDROID_STL=c++_static", "-DANDROID_TOOLCHAIN=clang", "-DANDROID_ARM_NEON=TRUE"
-                    cppFlags "-frtti -fexceptions"
+                    cppFlags "-frtti -fexceptions -fsigned-char"
                 }
             }
         }
diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android/app/build.gradle b/templates/js-template-default/frameworks/runtime-src/proj.android/app/build.gradle
@@ -34,7 +34,7 @@ android {
             else if (PROP_BUILD_TYPE == 'cmake') {
                 cmake {
                     arguments "-DCMAKE_FIND_ROOT_PATH=", "-DANDROID_STL=c++_static", "-DANDROID_TOOLCHAIN=clang", "-DANDROID_ARM_NEON=TRUE"
-                    cppFlags "-frtti -fexceptions"
+                    cppFlags "-frtti -fexceptions -fsigned-char"
                 }
             }
         }
diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/app/build.gradle b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/build.gradle
@@ -34,7 +34,7 @@ android {
             else if (PROP_BUILD_TYPE == 'cmake') {
                 cmake {
                     arguments "-DCMAKE_FIND_ROOT_PATH=", "-DANDROID_STL=c++_static", "-DANDROID_TOOLCHAIN=clang", "-DANDROID_ARM_NEON=TRUE"
-                    cppFlags "-frtti -fexceptions"
+                    cppFlags "-frtti -fexceptions -fsigned-char"
                 }
             }
         }
diff --git a/tests/cpp-empty-test/proj.android/app/build.gradle b/tests/cpp-empty-test/proj.android/app/build.gradle
@@ -36,7 +36,7 @@ android {
                     targets "cpp_empty_test"
                     arguments "-DCMAKE_FIND_ROOT_PATH=", "-DANDROID_STL=c++_static", "-DANDROID_TOOLCHAIN=clang",
                             "-DANDROID_ARM_NEON=TRUE"
-                    cppFlags "-frtti -fexceptions"
+                    cppFlags "-frtti -fexceptions -fsigned-char"
                 }
             }
         }
diff --git a/tests/cpp-tests/proj.android/app/build.gradle b/tests/cpp-tests/proj.android/app/build.gradle
@@ -35,7 +35,7 @@ android {
                 cmake {
                     targets 'cpp_tests'
                     arguments "-DCMAKE_FIND_ROOT_PATH=", "-DANDROID_STL=c++_static", "-DANDROID_TOOLCHAIN=clang", "-DANDROID_ARM_NEON=TRUE"
-                    cppFlags "-frtti -fexceptions"
+                    cppFlags "-frtti -fexceptions -fsigned-char"
                 }
             }
         }
diff --git a/tests/js-tests/project/proj.android/app/build.gradle b/tests/js-tests/project/proj.android/app/build.gradle
@@ -35,7 +35,7 @@ android {
                 cmake {
                     targets "js_tests"
                     arguments "-DCMAKE_FIND_ROOT_PATH=", "-DANDROID_STL=c++_static", "-DANDROID_TOOLCHAIN=clang", "-DANDROID_ARM_NEON=TRUE"
-                    cppFlags "-frtti -fexceptions"
+                    cppFlags "-frtti -fexceptions -fsigned-char"
                 }
             }
         }
diff --git a/tests/lua-empty-test/project/proj.android/app/build.gradle b/tests/lua-empty-test/project/proj.android/app/build.gradle
@@ -35,7 +35,7 @@ android {
                 cmake {
                     targets "lua_empty_test"
                     arguments "-DCMAKE_FIND_ROOT_PATH=", "-DANDROID_STL=c++_static", "-DANDROID_TOOLCHAIN=clang", "-DANDROID_ARM_NEON=TRUE"
-                    cppFlags "-frtti -fexceptions"
+                    cppFlags "-frtti -fexceptions -fsigned-char"
                 }
             }
         }
diff --git a/tests/lua-tests/project/proj.android/app/build.gradle b/tests/lua-tests/project/proj.android/app/build.gradle
@@ -35,7 +35,7 @@ android {
                 cmake {
                     targets 'lua_tests'
                     arguments "-DCMAKE_FIND_ROOT_PATH=", "-DANDROID_STL=c++_static", "-DANDROID_TOOLCHAIN=clang", "-DANDROID_ARM_NEON=TRUE"
-                    cppFlags "-frtti -fexceptions"
+                    cppFlags "-frtti -fexceptions -fsigned-char"
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ android {`
`35`	`35`	`cmake {`
`36`	`36`	`targets 'MyGame'`
`37`	`37`	`arguments "-DCMAKE_FIND_ROOT_PATH=", "-DANDROID_STL=c++_static", "-DANDROID_TOOLCHAIN=clang", "-DANDROID_ARM_NEON=TRUE"`
`38`		`- cppFlags "-frtti -fexceptions"`
	`38`	`+ cppFlags "-frtti -fexceptions -fsigned-char"`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ android {`
`34`	`34`	`else if (PROP_BUILD_TYPE == 'cmake') {`
`35`	`35`	`cmake {`
`36`	`36`	`arguments "-DCMAKE_FIND_ROOT_PATH=", "-DANDROID_STL=c++_static", "-DANDROID_TOOLCHAIN=clang", "-DANDROID_ARM_NEON=TRUE"`
`37`		`- cppFlags "-frtti -fexceptions"`
	`37`	`+ cppFlags "-frtti -fexceptions -fsigned-char"`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ android {`
`36`	`36`	`targets "cpp_empty_test"`
`37`	`37`	`arguments "-DCMAKE_FIND_ROOT_PATH=", "-DANDROID_STL=c++_static", "-DANDROID_TOOLCHAIN=clang",`
`38`	`38`	`"-DANDROID_ARM_NEON=TRUE"`
`39`		`- cppFlags "-frtti -fexceptions"`
	`39`	`+ cppFlags "-frtti -fexceptions -fsigned-char"`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`