From 31d234c1dae4fde5aea0bb1351b641d505f85b4b Mon Sep 17 00:00:00 2001 From: Evgeny Proydakov Date: Fri, 19 Feb 2021 02:18:17 +0300 Subject: [PATCH 1/2] Fixed cmake generation warning for regeneration project build files. [BEFORE]: % cmake .. CMake Warning (dev) at CMakeLists.txt:35 (project): Policy CMP0048 is not set: project() command manages VERSION variables. Run "cmake --help-policy CMP0048" for policy details. Use the cmake_policy command to set the policy and suppress this warning. The following variable(s) would be set to empty: CMAKE_PROJECT_VERSION CMAKE_PROJECT_VERSION_MAJOR CMAKE_PROJECT_VERSION_MINOR CMAKE_PROJECT_VERSION_PATCH This warning is for project developers. Use -Wno-dev to suppress it. -- No build type selected, default to Debug -- Found PythonInterp: /usr/local/bin/python3 (found version "3.9") -- Found PythonInterp: /usr/local/bin/python3 (found suitable version "3.9", minimum required is "3") -- optimizer enabled -- Google Mock found - building tests -- Configuring done [AFTER]: % cmake .. -- No build type selected, default to Debug -- Google Mock was not found - tests based on that will not build -- Configuring done -- Generating done --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d582926f..bcc329d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,15 +31,15 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -project(glslang - LANGUAGES CXX) - +cmake_minimum_required(VERSION 2.8.12) # increase to 3.1 once all major distributions # include a version of CMake >= 3.1 -cmake_minimum_required(VERSION 2.8.12) if (POLICY CMP0048) cmake_policy(SET CMP0048 NEW) endif() + +project(glslang LANGUAGES CXX) + set_property(GLOBAL PROPERTY USE_FOLDERS ON) # Enable compile commands database From 6332f80b2d0f6b13f0ef4f41066620cf1da62fde Mon Sep 17 00:00:00 2001 From: Evgeny Proydakov Date: Tue, 23 Feb 2021 17:14:12 +0300 Subject: [PATCH 2/2] Code review. Thx `greg-lunarg` for comments. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bcc329d2..af7b5ae7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,9 +31,9 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -cmake_minimum_required(VERSION 2.8.12) # increase to 3.1 once all major distributions # include a version of CMake >= 3.1 +cmake_minimum_required(VERSION 2.8.12) if (POLICY CMP0048) cmake_policy(SET CMP0048 NEW) endif()