Browse Source

Add default for CMake build type (#5586)

Add valgrind to dockerfile
lighta 4 years ago
parent
commit
712bca76da
2 changed files with 12 additions and 1 deletions
  1. 11 0
      CMakeLists.txt
  2. 1 1
      tools/docker/Dockerfile

+ 11 - 0
CMakeLists.txt

@@ -56,6 +56,17 @@ set(CMAKE_CXX_CREATE_SHARED_LIBRARY)
 set(CMAKE_DEBUG_POSTFIX "d")
 set(CMAKE_RELEASE_POSTFIX "r")
 
+# Set a default build type if none was specified
+set(default_build_type "Release")
+if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+  message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
+  set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE
+      STRING "Choose the type of build." FORCE)
+  # Set the possible values of build type for cmake-gui
+  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
+    "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
+endif()
+
 #
 # Prevent building in the source directory by default
 #

+ 1 - 1
tools/docker/Dockerfile

@@ -1,4 +1,4 @@
 FROM alpine:3.11
 WORKDIR /rathena
-RUN apk add --no-cache git cmake make gcc g++ gdb zlib-dev mariadb-dev ca-certificates linux-headers bash
+RUN apk add --no-cache git cmake make gcc g++ gdb zlib-dev mariadb-dev ca-certificates linux-headers bash valgrind
 ENTRYPOINT [ "bash" ]