diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2018-01-09 20:17:38 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2018-01-09 20:17:38 +0000 |
| commit | df4e807a2b0c447cbe34ad1f1f93c620299774e1 (patch) | |
| tree | ae17d2fddc789cea8a9fcd3572c7c961582c6a35 | |
| parent | Fix static build (diff) | |
| download | inkscape-df4e807a2b0c447cbe34ad1f1f93c620299774e1.tar.gz inkscape-df4e807a2b0c447cbe34ad1f1f93c620299774e1.zip | |
Fix profiling build
Also remove ConfigCompileFlags.cmake
(which wasn't included anymore for almost 10 years now)
Diffstat (limited to '')
| -rw-r--r-- | CMakeScripts/ConfigCompileFlags.cmake | 19 | ||||
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 9 |
2 files changed, 9 insertions, 19 deletions
diff --git a/CMakeScripts/ConfigCompileFlags.cmake b/CMakeScripts/ConfigCompileFlags.cmake deleted file mode 100644 index fa2362cd2..000000000 --- a/CMakeScripts/ConfigCompileFlags.cmake +++ /dev/null @@ -1,19 +0,0 @@ -# Define the flags for profiling if desired: -if(WITH_PROFILING) - set(COMPILE_PROFILING_FLAGS "-pg") - set(LINK_PROFILING_FLAGS "-pg") -endif() - -# add_definitions(-DVERSION=\\\"${INKSCAPE_VERSION}\\\") -add_definitions(${DEFINE_FLAGS} -DHAVE_CONFIG_H -D_INTL_REDIRECT_INLINE) - -if(WIN32) - add_definitions(-DXP_WIN) -endif(WIN32) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 ${COMPILE_PROFILING_FLAGS} ") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 ${COMPILE_PROFILING_FLAGS} ") - -set(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM} ") - -message(STATUS "${CMAKE_CXX_FLAGS}") diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index fac2d2160..ca0afe004 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -16,6 +16,15 @@ list(APPEND INKSCAPE_INCS ${PROJECT_SOURCE_DIR} # ---------------------------------------------------------------------------- list(APPEND INKSCAPE_CXX_FLAGS "-std=c++11") + +# Define the flags for profiling if desired: +if(WITH_PROFILING) + set(BUILD_SHARED_LIBS off) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg") +endif() + + # ---------------------------------------------------------------------------- # Files we include # ---------------------------------------------------------------------------- |