diff options
| author | Joshua L. Blocher <verbalshadow@gmail.com> | 2008-05-05 07:40:40 +0000 |
|---|---|---|
| committer | verbalshadow <verbalshadow@users.sourceforge.net> | 2008-05-05 07:40:40 +0000 |
| commit | cf180048cd40bc67c64097f984fc6a298b5adae4 (patch) | |
| tree | 2e244a5347a31e250b297731a919c462dba255b6 /CMakeScripts | |
| parent | copyedit (diff) | |
| download | inkscape-cf180048cd40bc67c64097f984fc6a298b5adae4.tar.gz inkscape-cf180048cd40bc67c64097f984fc6a298b5adae4.zip | |
Cmake: Moved helper macros to their own file and removed *-test.h from inkscape source list
(bzr r5608)
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/ConfigCompileFlags.cmake | 1 | ||||
| -rw-r--r-- | CMakeScripts/ConfigInkscapeDepends.cmake | 8 | ||||
| -rw-r--r-- | CMakeScripts/HelperMacros.cmake | 13 |
3 files changed, 19 insertions, 3 deletions
diff --git a/CMakeScripts/ConfigCompileFlags.cmake b/CMakeScripts/ConfigCompileFlags.cmake index c5447df49..d4ed503cb 100644 --- a/CMakeScripts/ConfigCompileFlags.cmake +++ b/CMakeScripts/ConfigCompileFlags.cmake @@ -22,3 +22,4 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILE_PROFILING_FLAGS} ") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMPILE_PROFILING_FLAGS} ") SET(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM} ") +message(STATUS "${CMAKE_CXX_FLAGS}") diff --git a/CMakeScripts/ConfigInkscapeDepends.cmake b/CMakeScripts/ConfigInkscapeDepends.cmake index 1f0eac639..7b74aef71 100644 --- a/CMakeScripts/ConfigInkscapeDepends.cmake +++ b/CMakeScripts/ConfigInkscapeDepends.cmake @@ -9,7 +9,7 @@ SET(INKSCAPE_DEPENDS gtkmm-2.4 sigc++-2.0
lcms
- libgc1c2
+# libgc1c2
libpng
libxml-2.0
libxslt
@@ -51,8 +51,10 @@ FOREACH(dep ${INKSCAPE_DEPENDS}) ENDFOREACH(dep) # Include non pkg-config dependencies:
-INCLUDE(FindBoost)
-INCLUDE(FindGC)
+INCLUDE(FindBoost) +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${BOOST_INCLUDE_DIR} ")
+INCLUDE(FindGC) +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${LIBGC_INCLUDE_DIR} ")
INCLUDE(IncludeJava)
# end Dependencies
diff --git a/CMakeScripts/HelperMacros.cmake b/CMakeScripts/HelperMacros.cmake new file mode 100644 index 000000000..dd8c25f00 --- /dev/null +++ b/CMakeScripts/HelperMacros.cmake @@ -0,0 +1,13 @@ +# A macro to replace slashes and spaces in a string with underscores
+MACRO(SANITIZE_PATH _string_var)
+ STRING(REGEX REPLACE "[\\/ ]+" "_" ${_string_var} ${${_string_var}})
+ENDMACRO(SANITIZE_PATH _string_var)
+
+# A macro to prepend a given string onto the beginning of each string in a list
+MACRO(PREPEND _list _str)
+ SET(_temp_list ${${_list}})
+ SET(${_list})
+ FOREACH(x ${_temp_list})
+ SET(${_list} ${${_list}} ${_str}${x})
+ ENDFOREACH(x)
+ENDMACRO(PREPEND _list _str) |