Skip to content

Commit

Permalink
fix: Cmake Errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@seobryn
seobryn committed Aug 3, 2023
1 parent 590aeef commit e14d813
Show file tree
Hide file tree
Showing 1,682 changed files with 5,900 additions and 5,769 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ include(CheckPlatform)

include(GroupSources)
include(AutoCollect)
include(ConfigInstall)

find_package(PCHSupport)
find_package(MySQL)
Expand Down
10 changes: 5 additions & 5 deletions LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ receive widespread use, become available for other developers to
incorporate. Many developers of free software are heartened and
encouraged by the resulting cooperation. However, in the case of
software used on network servers, this result may fail to come about.
The GNU General Public License permits making a modified version and
The GNU Affero General Public License permits making a modified version and
letting the public access it on a server without ever releasing its
source code to the public.

Expand Down Expand Up @@ -537,7 +537,7 @@ to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.

13. Remote Network Interaction; Use with the GNU General Public License.
13. Remote Network Interaction; Use with the GNU Affero General Public License.

Notwithstanding any other provision of this License, if you modify the
Program, your modified version must prominently offer all users
Expand All @@ -547,16 +547,16 @@ Source of your version by providing access to the Corresponding Source
from a network server at no charge, through some standard or customary
means of facilitating copying of software. This Corresponding Source
shall include the Corresponding Source for any work covered by version 3
of the GNU General Public License that is incorporated pursuant to the
of the GNU Affero General Public License that is incorporated pursuant to the
following paragraph.

Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU General Public License into a single
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the work with which it is combined will remain governed by version
3 of the GNU General Public License.
3 of the GNU Affero General Public License.

14. Revised Versions of this License.

Expand Down
2 changes: 1 addition & 1 deletion apps/conf_merge/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Author: Paradox
* Copyright: Paradox
* Email: [email protected] (paypal email)
* License: GNU General Public License v2(GPL)
* License: GNU Affero General Public License v2(GPL)
*/
?>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1251">
Expand Down
2 changes: 1 addition & 1 deletion apps/conf_merge/merge.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Author: Paradox
* Copyright: Paradox
* Email: [email protected] (paypal email)
* License: GNU General Public License v2(GPL)
* License: GNU Affero General Public License v2(GPL)
*/
if (!empty($_FILES['File1']) && !empty($_FILES['File2']))
{
Expand Down
33 changes: 33 additions & 0 deletions cmake/macros/ConfigInstall.cmake
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#
# Use it like:
# CopyModuleConfig("myModule.conf.dist")
#

function(CopyModuleConfig configDir)
set(postPath "configs/mods")

if(WIN32)
if("${CMAKE_MAKE_PROGRAM}" MATCHES "MSBuild")
add_custom_command(TARGET mods
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/${postPath}")
add_custom_command(TARGET mods
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy "${configDir}" "${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/${postPath}")
elseif(MINGW)
add_custom_command(TARGET mods
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bin/${postPath}")
add_custom_command(TARGET mods
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy "${configDir} ${CMAKE_BINARY_DIR}/bin/${postPath}")
endif()
endif()

if(UNIX)
install(FILES "${configDir}" DESTINATION "${CONF_DIR}/mods")
elseif(WIN32)
install(FILES "${configDir}" DESTINATION "${CMAKE_INSTALL_PREFIX}/${postPath}")
endif()
unset(postPath)
endfunction()
6 changes: 3 additions & 3 deletions cmake/stack_direction.c
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
/* Copyright (C) 2009 Sun Microsystems, Inc
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation; version 2 of the License.
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.
GNU Affero General Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU Affero General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */

Expand Down
6 changes: 3 additions & 3 deletions deps/gsoap/stdsoap2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ Copyright (C) 2000-2021, Robert van Engelen, Genivia Inc., All Rights Reserved.
GPL license.

This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
the terms of the GNU Affero General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any later
version.

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.
PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.

You should have received a copy of the GNU General Public License along with
You should have received a copy of the GNU Affero General Public License along with
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA

Expand Down
6 changes: 3 additions & 3 deletions deps/gsoap/stdsoap2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ Copyright (C) 2000-2021, Robert van Engelen, Genivia Inc., All Rights Reserved.
GPL license.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
the terms of the GNU Affero General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any later
version.
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.
PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
You should have received a copy of the GNU General Public License along with
You should have received a copy of the GNU Affero General Public License along with
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA
Expand Down
6 changes: 3 additions & 3 deletions deps/recastnavigation/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
# Copyright (C) 2005-2011 MaNGOS project <http://getmangos.com/>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# 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.
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# You should have received a copy of the GNU Affero General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
Expand Down
6 changes: 3 additions & 3 deletions doc/file-headers.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ To make things look uniform here's the headers we use for sourcefiles.
* This file is part of the FirelandsCore Project. See AUTHORS file for Copyright information
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* under the terms of the GNU Affero General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
* 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
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* You should have received a copy of the GNU Affero General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
23 changes: 13 additions & 10 deletions mods/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ foreach(SOURCE_MODULE ${MODULES_MODULE_LIST})
set(${MODULE_MODULE_VARIABLE} ${MODULES_DEFAULT_LINKAGE})
endif()

if("${${MODULE_MODULE_VARIABLE}}" STREQUAL "")
set(${MODULE_MODULE_VARIABLE} "static")
endif()

# Use only static for deprecated api loaders
if (FC_SCRIPTS_INCLUDES MATCHES "${SOURCE_MODULE}")
set(${MODULE_MODULE_VARIABLE} "static")
Expand All @@ -83,7 +87,6 @@ foreach(SOURCE_MODULE ${MODULES_MODULE_LIST})
if (SOURCE_MODULE MATCHES "mod-eluna")
ConfigureElunaModule(${SOURCE_MODULE})
endif()
message("MODULOS ${MODULE_MODULE_VARIABLE} ${${MODULE_MODULE_VARIABLE}}")

# Build the Graph values
if(${MODULE_MODULE_VARIABLE} MATCHES "dynamic")
Expand Down Expand Up @@ -230,7 +233,7 @@ foreach(SOURCE_MODULE ${MODULES_MODULE_LIST})

target_link_libraries(${MODULE_SOURCE_PROJECT_NAME}
PRIVATE
acore-core-interface
fc-core-interface
PUBLIC
game)

Expand All @@ -242,7 +245,7 @@ foreach(SOURCE_MODULE ${MODULES_MODULE_LIST})
set_target_properties(${MODULE_SOURCE_PROJECT_NAME}
PROPERTIES
FOLDER
"modules")
"mods")

if(UNIX)
install(TARGETS ${MODULE_SOURCE_PROJECT_NAME}
Expand Down Expand Up @@ -276,14 +279,14 @@ if (MOD_ELUNA_FOUND)
list(REMOVE_ITEM PRIVATE_SOURCES_MODULES ${MOD_ELUNA_PATH}/lualib/luac.c)
endif()

add_library(modules STATIC
add_library(mods STATIC
ModulesScriptLoader.h
${SCRIPT_MODULE_PRIVATE_SCRIPTLOADER}
${PRIVATE_SOURCES_MODULES})

target_link_libraries(modules
target_link_libraries(mods
PRIVATE
acore-core-interface
fc-core-interface
PUBLIC
game-interface)

Expand Down Expand Up @@ -348,22 +351,22 @@ foreach(ModuleName ${MODULE_LIST__})
endforeach()

# Define modules list
target_compile_options(modules
target_compile_options(mods
INTERFACE
-DFC_MODULES_LIST=$<1:"${MODULE_LIST}">)

# Define modules config list
target_compile_options(modules
target_compile_options(mods
INTERFACE
-DCONFIG_FILE_LIST=$<1:"${CONFIG_LIST}">)

if (MOD_ELUNA_FOUND)
if (APPLE)
target_compile_definitions(modules
target_compile_definitions(mods
PUBLIC
LUA_USE_MACOSX)
elseif (UNIX)
target_compile_definitions(modules
target_compile_definitions(mods
PUBLIC
LUA_USE_LINUX)
endif()
Expand Down
2 changes: 1 addition & 1 deletion mods/ModulesLoader.cpp.in.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* You should have received a copy of the GNU Affero General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/

Expand Down
2 changes: 1 addition & 1 deletion mods/ModulesPCH.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* You should have received a copy of the GNU Affero General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/

Expand Down
2 changes: 1 addition & 1 deletion mods/ModulesScriptLoader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* You should have received a copy of the GNU Affero General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/

Expand Down
6 changes: 3 additions & 3 deletions src/common/Asio/AsioHacksFwd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
* This file is part of the FirelandsCore Project. See AUTHORS file for Copyright information
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* under the terms of the GNU Affero General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
* 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
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* You should have received a copy of the GNU Affero General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/

Expand Down
6 changes: 3 additions & 3 deletions src/common/Asio/DeadlineTimer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
* This file is part of the FirelandsCore Project. See AUTHORS file for Copyright information
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* under the terms of the GNU Affero General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
* 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
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* You should have received a copy of the GNU Affero General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/

Expand Down
6 changes: 3 additions & 3 deletions src/common/Asio/IoContext.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
* This file is part of the FirelandsCore Project. See AUTHORS file for Copyright information
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* under the terms of the GNU Affero General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
* 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
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* You should have received a copy of the GNU Affero General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/

Expand Down
6 changes: 3 additions & 3 deletions src/common/Asio/IpAddress.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
* This file is part of the FirelandsCore Project. See AUTHORS file for Copyright information
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* under the terms of the GNU Affero General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
* 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
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* You should have received a copy of the GNU Affero General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/

Expand Down
Loading

0 comments on commit e14d813

Please sign in to comment.