Skip to content

Commit

Permalink
Upgrade minimum CMake to 3.1
Browse files Browse the repository at this point in the history
And update all the copyright years in those files
  • Loading branch information
xycaleth committed Apr 28, 2018
1 parent 698fe7c commit 37d9fb1
Show file tree
Hide file tree
Showing 15 changed files with 89 additions and 21 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#============================================================================
# Copyright (C) 2013 - 2015, OpenJK contributors
# Copyright (C) 2013 - 2018, OpenJK contributors
#
# This file is part of the OpenJK source code.
#
Expand All @@ -16,7 +16,7 @@
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#============================================================================

cmake_minimum_required(VERSION 2.8.9)
cmake_minimum_required(VERSION 3.1)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version")

# For checks in subdirectories
Expand Down
2 changes: 1 addition & 1 deletion code/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#============================================================================
# Copyright (C) 2013 - 2015, OpenJK contributors
# Copyright (C) 2013 - 2018, OpenJK contributors
#
# This file is part of the OpenJK source code.
#
Expand Down
2 changes: 1 addition & 1 deletion code/game/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#============================================================================
# Copyright (C) 2013 - 2015, OpenJK contributors
# Copyright (C) 2013 - 2018, OpenJK contributors
#
# This file is part of the OpenJK source code.
#
Expand Down
2 changes: 1 addition & 1 deletion code/rd-vanilla/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#============================================================================
# Copyright (C) 2013 - 2015, OpenJK contributors
# Copyright (C) 2013 - 2018, OpenJK contributors
#
# This file is part of the OpenJK source code.
#
Expand Down
2 changes: 1 addition & 1 deletion codeJK2/game/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#============================================================================
# Copyright (C) 2013 - 2015, OpenJK contributors
# Copyright (C) 2013 - 2018, OpenJK contributors
#
# This file is part of the OpenJK source code.
#
Expand Down
2 changes: 1 addition & 1 deletion codemp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#============================================================================
# Copyright (C) 2013 - 2015, OpenJK contributors
# Copyright (C) 2013 - 2018, OpenJK contributors
#
# This file is part of the OpenJK source code.
#
Expand Down
2 changes: 1 addition & 1 deletion codemp/cgame/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#============================================================================
# Copyright (C) 2013 - 2015, OpenJK contributors
# Copyright (C) 2013 - 2018, OpenJK contributors
#
# This file is part of the OpenJK source code.
#
Expand Down
2 changes: 1 addition & 1 deletion codemp/game/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#============================================================================
# Copyright (C) 2013 - 2015, OpenJK contributors
# Copyright (C) 2013 - 2018, OpenJK contributors
#
# This file is part of the OpenJK source code.
#
Expand Down
2 changes: 1 addition & 1 deletion codemp/rd-vanilla/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#============================================================================
# Copyright (C) 2013 - 2015, OpenJK contributors
# Copyright (C) 2013 - 2018, OpenJK contributors
#
# This file is part of the OpenJK source code.
#
Expand Down
2 changes: 1 addition & 1 deletion codemp/ui/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#============================================================================
# Copyright (C) 2013 - 2015, OpenJK contributors
# Copyright (C) 2013 - 2018, OpenJK contributors
#
# This file is part of the OpenJK source code.
#
Expand Down
18 changes: 18 additions & 0 deletions lib/libpng/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
#============================================================================
# Copyright (C) 2013 - 2018, OpenJK contributors
#
# This file is part of the OpenJK source code.
#
# OpenJK is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#============================================================================

# We only execute this script if the user wants to use our bundled libpng.
#
# It is built as a static relocatable library, and linked into any target that
Expand Down
20 changes: 19 additions & 1 deletion lib/minizip/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
#============================================================================
# Copyright (C) 2013 - 2018, OpenJK contributors
#
# This file is part of the OpenJK source code.
#
# OpenJK is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#============================================================================

# Build our bundled minizip.
#
# It is built as a static relocatable library, and linked into any target that
Expand Down Expand Up @@ -38,4 +56,4 @@ mark_as_advanced(MINIZIP_LIBRARIES MINIZIP_INCLUDE_DIRS)

# We need to build it as position-independent code, because it might get linked
# into dynamic libraries.
set_property(TARGET bundled_minizip PROPERTY POSITION_INDEPENDENT_CODE True)
set_property(TARGET bundled_minizip PROPERTY POSITION_INDEPENDENT_CODE True)
18 changes: 18 additions & 0 deletions lib/zlib/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
#============================================================================
# Copyright (C) 2013 - 2018, OpenJK contributors
#
# This file is part of the OpenJK source code.
#
# OpenJK is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#============================================================================

# We only execute this script if the user wants to use our bundled zlib/minizip.
#
# It is built as a static relocatable library, and linked into any target that
Expand Down
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#============================================================================
# Copyright (C) 2013 - 2015, OpenJK contributors
# Copyright (C) 2013 - 2018, OpenJK contributors
#
# This file is part of the OpenJK source code.
#
Expand Down
30 changes: 22 additions & 8 deletions tools/WinSymbol/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
cmake_minimum_required(VERSION 2.8.8)
#============================================================================
# Copyright (C) 2013 - 2018, OpenJK contributors
#
# This file is part of the OpenJK source code.
#
# OpenJK is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#============================================================================
cmake_minimum_required(VERSION 3.1)

add_executable(GetExeSymbolDir
get_exe_dir.cpp
)
add_executable(GetPdbSymbolDir
get_pdb_dir.cpp
)
add_executable(GetExeSymbolDir get_exe_dir.cpp)
target_link_libraries(GetExeSymbolDir Dbghelp)
target_link_libraries(GetPdbSymbolDir Dbghelp)

add_executable(GetPdbSymbolDir get_pdb_dir.cpp)
target_link_libraries(GetPdbSymbolDir Dbghelp)

0 comments on commit 37d9fb1

Please sign in to comment.