Am Fri, 16 May 2025 14:08:02 +0200 schrieb Scott Kostyshak <skost...@lyx.org>:
> > Could you set LYX_EXTERNAL_ICONV to on by default, except for windows? This
> > is a standard part of Unix.
>
> Kornel, any thoughts on this?
No problem. Maybe something like the attached.
> Scott
Kornel
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8efdfaeca5..9ced1e3fba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -156,38 +156,39 @@ else()
endif()
# Select some defaults depending on LYX_BUILD_TYPE
# they can always be overwritten by the respective command line settings
# These settings are only effective on fresh(==empty) CMakeCache.txt
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+ set(DefaultExternalLibs OFF)
+else()
+ set(DefaultExternalLibs ON)
+endif()
if(LYX_BUILD_TYPE STREQUAL "development")
set(DefaultLyxDebug ON)
set(DefaultLyxRelease OFF)
set(DefaultLyxStdlibDebug ON)
set(DefaultLyxEnableAssertions ON)
set(DefaultLyxProfile OFF)
- set(DefaultExternalLibs OFF)
elseif(LYX_BUILD_TYPE STREQUAL "prerelease")
set(DefaultLyxDebug OFF)
set(DefaultLyxRelease OFF)
set(DefaultLyxStdlibDebug OFF)
set(DefaultLyxEnableAssertions OFF)
set(DefaultLyxProfile OFF)
- set(DefaultExternalLibs ON)
elseif(LYX_BUILD_TYPE STREQUAL "release")
set(DefaultLyxDebug OFF)
set(DefaultLyxRelease ON)
set(DefaultLyxStdlibDebug OFF)
set(DefaultLyxEnableAssertions OFF)
set(DefaultLyxProfile OFF)
- set(DefaultExternalLibs ON)
elseif(LYX_BUILD_TYPE STREQUAL "gprof")
set(DefaultLyxDebug ON)
set(DefaultLyxRelease OFF)
set(DefaultLyxStdlibDebug OFF)
set(DefaultLyxEnableAssertions OFF)
set(DefaultLyxProfile ON)
- set(DefaultExternalLibs OFF)
else()
message(FATAL_ERROR "Invalid build type (${LYX_BUILD_TYPE}) encountered")
endif()
# Options for all compilers/systems
pgpyB08ejDi5L.pgp
Description: Digitale Signatur von OpenPGP
-- lyx-devel mailing list lyx-devel@lists.lyx.org https://lists.lyx.org/mailman/listinfo/lyx-devel
