mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-29 22:00:27 +08:00
0bee296e72
* Added new port GASol * added patch file * Code Refactoring * Code Refactoring to change port name * Updated baseline to resolve file conflicts with nanovg and stb * Added changes to ci-baseline and added port not supported on arm/uwp * [gasol] Use cmake to build * update baseline Co-authored-by: SanaJahan <sanadgrt@gmail.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
32 lines
965 B
Diff
32 lines
965 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 4a21f65..a4cede0 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -15,11 +15,15 @@ set(CMAKE_CXX_EXTENSIONS OFF)
|
|
# Find OpenMP.
|
|
find_package(OpenMP)
|
|
if (OPENMP_FOUND)
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS} -fPIC -Wall -Wextra -Werror -pedantic")
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS} -fPIC -pedantic")
|
|
else()
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -Wextra -Werror -pedantic")
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -pedantic")
|
|
endif()
|
|
|
|
+if(CMAKE_COMPILER_IS_GNUCXX)
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
|
|
+endif(CMAKE_COMPILER_IS_GNUCXX)
|
|
+
|
|
if (COV)
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
|
|
endif()
|
|
@@ -39,7 +43,7 @@ endif()
|
|
add_subdirectory(src)
|
|
|
|
# GASol test dir.
|
|
-add_subdirectory(unittest)
|
|
+# add_subdirectory(unittest)
|
|
|
|
# GASol run dir.
|
|
add_subdirectory(example)
|