drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 04:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add generator_tool target

Browse Source 
Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
This commit is contained in:
x7z4w
2025-06-22 20:58:48 +00:00
committed by Konstantin Pastbin
parent dde65a918b
commit 539e5cdfeb
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -94,11 +94,6 @@ if (PLATFORM_WIN)
) )
endif() endif()
# Try fast native arch.
if (PLATFORM_LINUX)
add_compile_options(-march=native)
endif()
# Built-in CMake configurations: Debug, Release, RelWithDebInfo, MinSizeRel # Built-in CMake configurations: Debug, Release, RelWithDebInfo, MinSizeRel
if (${CMAKE_BUILD_TYPE} STREQUAL "Debug") if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
add_definitions(-DDEBUG) add_definitions(-DDEBUG)
@@ -264,6 +259,10 @@ if (PLATFORM_DESKTOP)
add_subdirectory(qt) add_subdirectory(qt)
omim_add_tool_subdirectory(skin_generator) omim_add_tool_subdirectory(skin_generator)
endif() endif()
if (GENERATOR_TOOL)
add_compile_options(-march=native -mtune=native)
message(STATUS "target CPU optimizations enabled, produced binaries will NOT work on a different CPU")
endif()
add_subdirectory(dev_sandbox) add_subdirectory(dev_sandbox)
endif() endif()

6
tools/unix/build_omim.sh
View File

@@ -58,7 +58,7 @@ done
OPT_TARGET=${@:$OPTIND} OPT_TARGET=${@:$OPTIND}
CMAKE_CONFIG="${CMAKE_CONFIG:-} -U SKIP_QT_GUI" CMAKE_CONFIG="${CMAKE_CONFIG:-} -U SKIP_QT_GUI"
if [ "$OPT_TARGET" != "desktop" -a -z "$OPT_DESIGNER" -a -z "$OPT_STANDALONE" ]; then if [ "$OPT_TARGET" != "desktop" -a -z "$OPT_DESIGNER" -a -z "$OPT_STANDALONE"] || [[ "$OPT_TARGET" =~ "generator_tool|topography_generator_tool|world_roads_builder_tool|mwm_diff_tool" ]]; then
CMAKE_CONFIG="${CMAKE_CONFIG:-} -DSKIP_QT_GUI=ON" CMAKE_CONFIG="${CMAKE_CONFIG:-} -DSKIP_QT_GUI=ON"
fi fi
@@ -68,6 +68,10 @@ if [ -z "$OPT_DEBUG$OPT_RELEASE$OPT_RELEASEDEBUGINFO" ]; then
OPT_RELEASEDEBUGINFO=1 OPT_RELEASEDEBUGINFO=1
fi fi
if [[ "$OPT_TARGET" =~ "generator_tool|topography_generator_tool|world_roads_builder_tool|mwm_diff_tool" ]]; then
CMAKE_CONFIG="${CMAKE_CONFIG:-} -DGENERATOR_TOOL=ON"
fi
OMIM_PATH="$(cd "${OMIM_PATH:-$(dirname "$0")/../..}"; pwd)" OMIM_PATH="$(cd "${OMIM_PATH:-$(dirname "$0")/../..}"; pwd)"
if ! grep "DEFAULT_URLS_JSON" "$OMIM_PATH/private.h" >/dev/null 2>/dev/null; then if ! grep "DEFAULT_URLS_JSON" "$OMIM_PATH/private.h" >/dev/null 2>/dev/null; then
echo "Please run $OMIM_PATH/configure.sh" echo "Please run $OMIM_PATH/configure.sh"