From 712fbb4affab1a900a9c8a68660354a61541f5b9 Mon Sep 17 00:00:00 2001 From: Mikaël Capelle Date: Tue, 19 Apr 2022 15:24:09 +0200 Subject: Update following cmake_common changes. # Conflicts: # CMakeLists.txt # src/CMakeLists.txt # src/organizer_en.ts --- CMakeLists.txt | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 03ed0307..c1c1cf9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,23 +1,16 @@ cmake_minimum_required(VERSION 3.16) -project(organizer) -set(project_type exe) -set(executable_name ModOrganizer) -set(enable_warnings OFF) - +# TODO: move these to cmake_common? set(OPENSSL_USE_STATIC_LIBS FALSE CACHE STRING "" FORCE) set(MySQL_INCLUDE_DIRS CACHE STRING "" FORCE) -# appveyor does not build modorganizer in its standard location, so use -# DEPENDENCIES_DIR to find cmake_common if(DEFINED DEPENDENCIES_DIR) - include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/project.cmake) + include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/mo2.cmake) else() - include(../cmake_common/project.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/../cmake_common/mo2.cmake) endif() -set(additional_translations ${uibase_path}/src) - +project(organizer) add_subdirectory(src) -install(FILES dump_running_process.bat DESTINATION bin) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dump_running_process.bat DESTINATION bin) -- cgit v1.3.1