Skip to content

CMake corrections: datadir, minimum CMake #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

CMake corrections: datadir, minimum CMake #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cc889b
CMake corrections: datadir, minimum CMake
scivision Jun 24, 2022
0a57e2a
cmake:visual studio: add warning /w3
scivision Jun 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
cmake_minimum_required(VERSION 3.7...3.21)
cmake_minimum_required(VERSION 3.14...3.24)
project(2048 LANGUAGES CXX)
enable_testing()

set(SOURCES src/2048.cpp src/gameboard.cpp src/gameboard-graphics.cpp src/game.cpp src/game-graphics.cpp src/game-input.cpp src/game-pregamemenu.cpp src/global.cpp src/loadresource.cpp src/menu.cpp src/menu-graphics.cpp src/saveresource.cpp src/scores.cpp src/scores-graphics.cpp src/statistics.cpp src/statistics-graphics.cpp src/tile.cpp src/tile-graphics.cpp)

if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
add_compile_options(-Wall)
elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
add_compile_options(-Wall)
elseif(CMAKE_CXX_COMPILER_ID MATCHES "^Intel")
if(WIN32)
add_compile_options(/W3)
else()
add_compile_options(-w2)
endif()
elseif(CMAKE_CXX_COMPILER_ID STREQUAL NVHPC)
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
add_compile_options(/W3)
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "NVHPC")
add_compile_options(-a)
endif()

Expand All @@ -33,8 +33,8 @@ endif()

# --- install

install(TARGETS 2048
RUNTIME DESTINATION bin)
install(TARGETS 2048)

install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data
DESTINATION ${CMAKE_INSTALL_PREFIX})
DESTINATION ${CMAKE_INSTALL_PREFIX}/data
)
13 changes: 3 additions & 10 deletions setup.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,11 @@ set(_opts)
if(NOT DEFINED CTEST_CMAKE_GENERATOR AND DEFINED ENV{CMAKE_GENERATOR})
set(CTEST_CMAKE_GENERATOR $ENV{CMAKE_GENERATOR})
endif()
if(NOT DEFINED CTEST_CMAKE_GENERATOR AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.17)
if(NOT DEFINED CTEST_CMAKE_GENERATOR)
find_program(_gen NAMES ninja ninja-build samu)
if(_gen)
execute_process(COMMAND ${_gen} --version
OUTPUT_VARIABLE _ninja_version
OUTPUT_STRIP_TRAILING_WHITESPACE
RESULT_VARIABLE _gen_ok
TIMEOUT 10)
if(_gen_ok EQUAL 0 AND _ninja_version VERSION_GREATER_EQUAL 1.10)
set(CTEST_CMAKE_GENERATOR "Ninja")
endif()
endif(_gen)
set(CTEST_CMAKE_GENERATOR "Ninja")
endif()
endif()
if(NOT DEFINED CTEST_CMAKE_GENERATOR)
set(CTEST_BUILD_FLAGS -j) # not --parallel as this goes to generator directly
Expand Down