Author: craig
Date: Sun Aug 11 20:03:48 2019
New Revision: 23125
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23125
Log:
#15711:related append flags isntead of overwriting them
Modified:
trunk/Scribus/CMakeLists.txt
Modified: trunk/Scribus/CMakeLists.txt
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23125&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Sun Aug 11 20:03:48 2019
@@ -651,16 +651,16 @@
set(ENV{LD_PREBIND} 1 )
set(ENV{LD_PREBIND_ALLOW_OVERLAP} 1 )
if (WANT_DEBUG)
- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -fno-inline-functions -Wall
-mmacosx-version-min=${OSXMINVER}")
- set(CMAKE_C_FLAGS_DEBUG "-O0 -g -fno-inline-functions -Wall
-mmacosx-version-min=${OSXMINVER}")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g
-fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
+ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g
-fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
endif()
if (WANT_RELEASEWITHDEBUG)
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g
-fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -fno-inline-functions
-Wall -mmacosx-version-min=${OSXMINVER}")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
"${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -fno-inline-functions -Wall
-mmacosx-version-min=${OSXMINVER}")
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO
"${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -g -fno-inline-functions -Wall
-mmacosx-version-min=${OSXMINVER}")
endif()
if (NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -fno-inline-functions -Wall
-mmacosx-version-min=${OSXMINVER}")
- set(CMAKE_C_FLAGS_RELEASE "-O2 -fno-inline-functions -Wall
-mmacosx-version-min=${OSXMINVER}")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2
-fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2
-fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
endif()
else()
if(${CMAKE_GENERATOR} MATCHES "^(Visual Studio|NMake).*")
@@ -670,8 +670,8 @@
set(CMAKE_C_FLAGS_DEBUG)
else()
# vanilla gcc
- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -Wall -fstrict-aliasing
-Wl,-E")
- set(CMAKE_C_FLAGS_DEBUG "-O0 -g -Wall -fstrict-aliasing -Wl,-E")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g
-Wall -fstrict-aliasing -Wl,-E")
+ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -Wall
-fstrict-aliasing -Wl,-E")
if (_machine_x86 OR _machine_x86_64)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}
-fPIC")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fPIC")
@@ -681,8 +681,8 @@
set(CMAKE_CXX_FLAGS_RELEASE)
set(CMAKE_C_FLAGS_RELEASE)
else()
- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -Wall -fPIC -Wl,-E")
- set(CMAKE_C_FLAGS_RELEASE "-O2 -Wall -fPIC -Wl,-E")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2
-Wall -fPIC -Wl,-E")
+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -Wall
-fPIC -Wl,-E")
# add_definitions(-DNDEBUG)
endif()
endif()
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
