r23124 by craig - Fix old issue of release flags on Apple being overwritten

scribus-commit scribus-commit at lists.scribus.net
Sat Aug 10 08:32:40 UTC 2019


Author: craig
Date: Sat Aug 10 08:32:40 2019
New Revision: 23124

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23124
Log:
Fix old issue of release flags on Apple being overwritten

Modified:
    trunk/Scribus/CMakeLists.txt

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23124&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Sat Aug 10 08:32:40 2019
@@ -677,17 +677,15 @@
 			set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fPIC")
 		endif()
 	endif()
-endif()
-
-if(${CMAKE_GENERATOR} MATCHES "^(Visual Studio|NMake).*")
-	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")
-#	add_definitions(-DNDEBUG)
-endif()
-
+	if(${CMAKE_GENERATOR} MATCHES "^(Visual Studio|NMake).*")
+		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")
+	#	add_definitions(-DNDEBUG)
+	endif()
+endif()
 if(WIN32)
 	add_definitions(-DWIN32_LEAN_AND_MEAN
 					-DAVOID_WIN32_FILEIO




More information about the scribus-commit mailing list