diff options
| author | Joshua L. Blocher <verbalshadow@gmail.com> | 2008-05-02 06:03:19 +0000 |
|---|---|---|
| committer | verbalshadow <verbalshadow@users.sourceforge.net> | 2008-05-02 06:03:19 +0000 |
| commit | 9b205f84593821a8cf4ebb7f0d4f6306bbe1d084 (patch) | |
| tree | 2b63e99a33597cc4c8d0287a5d9097d3fbd9ce1a /CMakeScripts/ConfigInkscapeDepends.cmake | |
| parent | Removed Submenu name "Object" from randompnt.inx and randompos.inx to stop bo... (diff) | |
| download | inkscape-9b205f84593821a8cf4ebb7f0d4f6306bbe1d084.tar.gz inkscape-9b205f84593821a8cf4ebb7f0d4f6306bbe1d084.zip | |
Cmake: More cleanup moved all known paths into ConfigPaths.cmake and temp Linking checking to help resolve linking issues
(bzr r5576)
Diffstat (limited to '')
| -rw-r--r-- | CMakeScripts/ConfigInkscapeDepends.cmake | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/CMakeScripts/ConfigInkscapeDepends.cmake b/CMakeScripts/ConfigInkscapeDepends.cmake index af826ed1f..bd2edfc48 100644 --- a/CMakeScripts/ConfigInkscapeDepends.cmake +++ b/CMakeScripts/ConfigInkscapeDepends.cmake @@ -41,7 +41,7 @@ FOREACH(dep ${INKSCAPE_DEPENDS}) message(STATUS "${dep}: FOUND")
# Set Compiler Flags
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${dep_name}_CFLAGS}")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${${dep_name}_CFLAGS}")
+# SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${${dep_name}_CFLAGS}")
SET(INKSCAPE_LINK_FLAGS "${INKSCAPE_LINK_FLAGS} ${${dep_name}_LINK_FLAGS}")
ELSE("${dep}_FOUND")
message(STATUS "${dep}: NOT FOUND")
@@ -65,7 +65,8 @@ FOREACH(opt ${INKSCAPE_OPTIONAL}) # PKGCONFIG_VERSION(${opt} "${opt}_VERSION")
IF("${opt}_FOUND")
message(STATUS "${opt}: FOUND")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${dep_name}_CFLAGS}")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${opt_name}_CFLAGS}") +# SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${${opt_name}_CFLAGS}")
SET(INKSCAPE_LINK_FLAGS "${INKSCAPE_LINK_FLAGS} ${${opt_name}_LINK_FLAGS}")
ELSE("${opt}_FOUND")
message(STATUS "${opt}: NOT FOUND")
@@ -146,5 +147,8 @@ ENDIF(HAVE_CAIRO_PDF) # Create them in the binary root dir
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
FILE(WRITE ${CMAKE_BINARY_DIR}/inkscape_version.h "#define INKSCAPE_VERSION \"${INKSCAPE_VERSION}\"\n")
-INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}") # Include base dir, so other files can refer to the generated files.
-# CMAKE_INCLUDE_CURRENT_DIR is not enough as it only includes the current dir and not the basedir with config.h in it + +#Linking check +message(STATUS "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") +message(STATUS "${INKSCAPE_LINK_FLAGS}") +message(STATUS "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") |