[opengtl-commits] [317] fix add_definitions to work with new cmake behaviour

[subversion@xxxxxxxxxxxxx]

Revision: 317
Author:   cyrille
Date:     2008-08-06 10:08:01 +0200 (Wed, 06 Aug 2008)

Log Message:
-----------
fix add_definitions to work with new cmake behaviour

Modified Paths:
--------------
    trunk/OpenGTL/OpenCTL/OpenCTL/CMakeLists.txt
    trunk/OpenGTL/OpenGTL/GTLCore/CMakeLists.txt
    trunk/OpenGTL/OpenGTL/GTLImageIO/CMakeLists.txt
    trunk/OpenGTL/OpenShiva/OpenShiva/CMakeLists.txt


Modified: trunk/OpenGTL/OpenCTL/OpenCTL/CMakeLists.txt
===================================================================
--- trunk/OpenGTL/OpenCTL/OpenCTL/CMakeLists.txt	2008-08-06 07:59:05 UTC (rev 316)
+++ trunk/OpenGTL/OpenCTL/OpenCTL/CMakeLists.txt	2008-08-06 08:08:01 UTC (rev 317)
@@ -23,13 +23,8 @@
 add_definitions( "-D__STDC_LIMIT_MACROS" )
 add_definitions( -DCOUMPONENT_NAME=\"\\\"OpenCTL\\\"\" )
 
-if (NOT APPLE)
-  add_definitions( -D_OPENCTL_CTL_STD_LIB_SRC_DIR_=\\"${CMAKE_CURRENT_SOURCE_DIR}/\\")
-  add_definitions( -D_OPENCTL_CTL_SHARE_DIR_=\\"${SHARE_INSTALL_DIR}/ctl\\" )
-else (NOT APPLE)
-  add_definitions( -D_OPENCTL_CTL_STD_LIB_SRC_DIR_='\"${CMAKE_CURRENT_SOURCE_DIR}/\"')
-  add_definitions( -D_OPENCTL_CTL_SHARE_DIR_='\"${SHARE_INSTALL_DIR}/ctl\"' )
-endif(NOT APPLE)
+add_definitions( -D_OPENCTL_CTL_STD_LIB_SRC_DIR_="${CMAKE_CURRENT_SOURCE_DIR}")
+add_definitions( -D_OPENCTL_CTL_SHARE_DIR_="${SHARE_INSTALL_DIR}/ctl" )
 
 
 # Set the ABI version of the library

Modified: trunk/OpenGTL/OpenGTL/GTLCore/CMakeLists.txt
===================================================================
--- trunk/OpenGTL/OpenGTL/GTLCore/CMakeLists.txt	2008-08-06 07:59:05 UTC (rev 316)
+++ trunk/OpenGTL/OpenGTL/GTLCore/CMakeLists.txt	2008-08-06 08:08:01 UTC (rev 317)
@@ -68,7 +68,7 @@
 
 # __STDC_LIMIT_MACROS is needed by LLVM's DataTypes.h
 add_definitions( "-D__STDC_LIMIT_MACROS" )
-add_definitions( -DCOUMPONENT_NAME=\"\\\"GTLCore\\\"\" )
+add_definitions( -DCOUMPONENT_NAME="GTLCore" )
 
 # installation
 install(TARGETS GTLCore  DESTINATION ${LIB_INSTALL_DIR} )

Modified: trunk/OpenGTL/OpenGTL/GTLImageIO/CMakeLists.txt
===================================================================
--- trunk/OpenGTL/OpenGTL/GTLImageIO/CMakeLists.txt	2008-08-06 07:59:05 UTC (rev 316)
+++ trunk/OpenGTL/OpenGTL/GTLImageIO/CMakeLists.txt	2008-08-06 08:08:01 UTC (rev 317)
@@ -8,18 +8,14 @@
     ImageDC.cpp
     ImageDCRegistry.cpp )
 
-if (NOT APPLE)
-  add_definitions( -D_GTLIMAGEIO_EXTENSIONS_INSTALL_DIR_=\\"${GTLIMAGEIO_EXTENSIONS_INSTALL_DIR}\\" )
-else (NOT APPLE)
-  add_definitions( -D_GTLIMAGEIO_EXTENSIONS_INSTALL_DIR_='\"${GTLIMAGEIO_EXTENSIONS_INSTALL_DIR}\"' )
-endif(NOT APPLE)
+add_definitions( -D_GTLIMAGEIO_EXTENSIONS_INSTALL_DIR_="${GTLIMAGEIO_EXTENSIONS_INSTALL_DIR}" )
 
 add_library(GTLImageIO SHARED ${GTLImageIO_SRCS} )
 target_link_libraries(GTLImageIO GTLCore )
 
 # __STDC_LIMIT_MACROS is needed by LLVM's DataTypes.h
 add_definitions( "-D__STDC_LIMIT_MACROS" )
-add_definitions( -DCOUMPONENT_NAME=\"\\\"GTLImageIO\\\"\" )
+add_definitions( -DCOUMPONENT_NAME="GTLImageIO" )
 
 # Set the ABI version of the library
 set_target_properties(GTLImageIO PROPERTIES VERSION ${OPENGTL_LIB_VERSION} SOVERSION ${OPENGTL_LIB_SOVERSION} )

Modified: trunk/OpenGTL/OpenShiva/OpenShiva/CMakeLists.txt
===================================================================
--- trunk/OpenGTL/OpenShiva/OpenShiva/CMakeLists.txt	2008-08-06 07:59:05 UTC (rev 316)
+++ trunk/OpenGTL/OpenShiva/OpenShiva/CMakeLists.txt	2008-08-06 08:08:01 UTC (rev 317)
@@ -23,19 +23,12 @@
 
 # __STDC_LIMIT_MACROS is needed by LLVM's DataTypes.h
 add_definitions( "-D__STDC_LIMIT_MACROS" )
-add_definitions( -DCOUMPONENT_NAME=\"\\\"OpenShiva\\\"\" )
+add_definitions( -DCOUMPONENT_NAME="OpenShiva" )
 
-if (NOT APPLE)
-  add_definitions( -D_OPENSHIVA_SHIVA_STD_LIB_BUILD_DIR_=\\"${CMAKE_CURRENT_BINARY_DIR}/../ShivaStdLib/\\")
-  add_definitions( -D_OPENSHIVA_LIB_INSTALL_=\\"${CMAKE_INSTALL_PREFIX}/lib/\\")
-  add_definitions( -D_OPENSHIVA_SHIVA_STD_LIB_SRC_DIR_=\\"${CMAKE_CURRENT_SOURCE_DIR}/../ShivaStdLib/\\")
-  add_definitions( -D_OPENSHIVA_SHIVA_SHARE_DIR_=\\"${SHARE_INSTALL_DIR}/shiva\\" )
-else (NOT APPLE)
-  add_definitions( -D_OPENSHIVA_SHIVA_STD_LIB_BUILD_DIR_='\"${CMAKE_CURRENT_BINARY_DIR}/../ShivaStdLib/\"')
-  add_definitions( -D_OPENSHIVA_LIB_INSTALL_='\"${CMAKE_INSTALL_PREFIX}/lib/\"')
-  add_definitions( -D_OPENSHIVA_SHIVA_STD_LIB_SRC_DIR_='\"${CMAKE_CURRENT_SOURCE_DIR}/../ShivaStdLib/\"')
-  add_definitions( -D_OPENSHIVA_SHIVA_SHARE_DIR_='\"${SHARE_INSTALL_DIR}/shiva\"' )
-endif(NOT APPLE)
+add_definitions( -D_OPENSHIVA_SHIVA_STD_LIB_BUILD_DIR_="${CMAKE_CURRENT_BINARY_DIR}/../ShivaStdLib/")
+add_definitions( -D_OPENSHIVA_LIB_INSTALL_="${CMAKE_INSTALL_PREFIX}/lib/")
+add_definitions( -D_OPENSHIVA_SHIVA_STD_LIB_SRC_DIR_="${CMAKE_CURRENT_SOURCE_DIR}/../ShivaStdLib/")
+add_definitions( -D_OPENSHIVA_SHIVA_SHARE_DIR_="${SHARE_INSTALL_DIR}/shiva" )
 
 
 # Set the ABI version of the library