From 5ffb302a743091b9b31a2b2eb5346f179dbfeaa5 Mon Sep 17 00:00:00 2001 From: Robert Russell Date: Tue, 25 May 2021 11:00:54 -0400 Subject: [PATCH] Update CMakeLists.txt there's nothing in ../../src but there is in ../../auto/src So I think someone moved the files but didn't update the CMakeLists.txt --- build/cmake/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt index 5565f92..2c42f59 100644 --- a/build/cmake/CMakeLists.txt +++ b/build/cmake/CMakeLists.txt @@ -32,14 +32,14 @@ option (GLEW_X11 "X11 mode" ON) option (GLEW_EGL "EGL mode" OFF) option (BUILD_SHARED_LIBS "install/link shared instead of static libs" ON) -set (GLEW_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../..) +set (GLEW_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../auto) # get version from config/version -file (STRINGS ${GLEW_DIR}/config/version _VERSION_MAJOR_STRING REGEX "GLEW_MAJOR[ ]*=[ ]*[0-9]+.*") +file (STRINGS ${GLEW_DIR}/../config/version _VERSION_MAJOR_STRING REGEX "GLEW_MAJOR[ ]*=[ ]*[0-9]+.*") string (REGEX REPLACE "GLEW_MAJOR[ ]*=[ ]*([0-9]+)" "\\1" CPACK_PACKAGE_VERSION_MAJOR ${_VERSION_MAJOR_STRING}) -file (STRINGS ${GLEW_DIR}/config/version _VERSION_MINOR_STRING REGEX "GLEW_MINOR[ ]*=[ ]*[0-9]+.*") +file (STRINGS ${GLEW_DIR}/../config/version _VERSION_MINOR_STRING REGEX "GLEW_MINOR[ ]*=[ ]*[0-9]+.*") string (REGEX REPLACE "GLEW_MINOR[ ]*=[ ]*([0-9]+)" "\\1" CPACK_PACKAGE_VERSION_MINOR ${_VERSION_MINOR_STRING}) -file (STRINGS ${GLEW_DIR}/config/version _VERSION_PATCH_STRING REGEX "GLEW_MICRO[ ]*=[ ]*[0-9]+.*") +file (STRINGS ${GLEW_DIR}/../config/version _VERSION_PATCH_STRING REGEX "GLEW_MICRO[ ]*=[ ]*[0-9]+.*") string (REGEX REPLACE "GLEW_MICRO[ ]*=[ ]*([0-9]+)" "\\1" CPACK_PACKAGE_VERSION_PATCH ${_VERSION_PATCH_STRING}) set (GLEW_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})