Skip to content

G
glslang
Unverified Commit 3aa44314 by John Kessenich Committed by GitHub
Options

Merge pull request #2339 from ben-clayton/cmake-project

CMake: Move project() to top of CMakeLists.txt
parents 7bedc52a 6b20d83c
Showing with 4 additions and 3 deletions
CMakeLists.txt
...@@ -31,6 +31,9 @@ ...@@ -31,6 +31,9 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
project(glslang
LANGUAGES CXX)
# increase to 3.1 once all major distributions # increase to 3.1 once all major distributions
# include a version of CMake >= 3.1 # include a version of CMake >= 3.1
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
...@@ -115,8 +118,6 @@ if(USE_CCACHE) ...@@ -115,8 +118,6 @@ if(USE_CCACHE)
endif(CCACHE_FOUND) endif(CCACHE_FOUND)
endif() endif()
project(glslang)
if(ENABLE_CTEST) if(ENABLE_CTEST)
include(CTest) include(CTest)
endif() endif()
...@@ -303,7 +304,7 @@ if(NOT CMAKE_VERSION VERSION_LESS "3.16") ...@@ -303,7 +304,7 @@ if(NOT CMAKE_VERSION VERSION_LESS "3.16")
else() else()
function(glslang_pch target pch) function(glslang_pch target pch)
endfunction() endfunction()
message(NOTICE "Your CMake version is ${CMAKE_VERSION}. Update to at least 3.16 to enable precompiled headers to speed up incremental builds") message("Your CMake version is ${CMAKE_VERSION}. Update to at least 3.16 to enable precompiled headers to speed up incremental builds")
endif() endif()
if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External) if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment