changes to install macros, verification to set a variable, now able to install multip...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb8dd3e112e0b1bcb6a6025814c7f1bee45f4ace..18c71df33c5bee09d44771edee422fcb22377117 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,6 +69,10 @@ INCLUDE(${CREA_CMAKE_DIR}/CREAResolveOptions.cmake)
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src)
 INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/src)
 
+#JCP UBUNTU
+INCLUDE_DIRECTORIES(/usr/lib/x86_64-linux-gnu/glib-2.0/include/)
+#JCP UBUNTU
+
 ADD_SUBDIRECTORY(cmake)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(appli)

diff --git a/cmake/CREAMacro_AddLibrary.cmake b/cmake/CREAMacro_AddLibrary.cmake
index 7ae0240689dfb342cffdbcf28ac5e6ea4ad6925e..ae0dce1fa9ac8f86ae449761ebecc4b97752737f 100644 (file)
--- a/cmake/CREAMacro_AddLibrary.cmake
+++ b/cmake/CREAMacro_AddLibrary.cmake
@@ -46,4 +46,3 @@ ELSE(WIN32)
 ENDIF(WIN32)
 
 ENDMACRO(CREA_ADD_LIBRARY)
-

diff --git a/cmake/CREAMacro_InstallLibraryForCMake.cmake b/cmake/CREAMacro_InstallLibraryForCMake.cmake
index 59966796b1af73539e5d6dae78482b518d65c397..6faf84eb0c9ec789aae6536522210868e652853f 100644 (file)
--- a/cmake/CREAMacro_InstallLibraryForCMake.cmake
+++ b/cmake/CREAMacro_InstallLibraryForCMake.cmake
@@ -94,8 +94,8 @@
 #
 #-----------------------------------------------------------------------------
 
-MACRO(CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE LIBRARY_NAME)
-
+MACRO(CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE LIBRARY_NAME) 
+  
   #---------------------------------------------------------------------------
   # Sets the common values to build tree and install tree configs
   SET(CILC_LIB_REQUIRED_C_FLAGS    ${${LIBRARY_NAME}_REQUIRED_C_FLAGS})
@@ -184,6 +184,8 @@ MACRO(CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE LIBRARY_NAME)
     ENDIF(${LIBRARY_NAME}_INSTALL_FOLDER)
   ENDIF(WIN32)
 
+  message(STATUS "Library Install Path ${INSTALL_PATH}")
+
   # UseLIBRARY_NAME.cmake 
   CONFIGURE_FILE(
     ${CREA_CMAKE_DIR}/InstallLibraryForCMake_UseLibrary.cmake.in
@@ -278,7 +280,10 @@ ENDMACRO(CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE)
 MACRO(CREA_INSTALL_LIBRARY_FOR_CMAKE LIBRARY_NAME1)
   
   # Sets the settings to default values
-  SET(${LIBRARY_NAME1}_INSTALL_FOLDER ${LIBRARY_NAME1})
+  IF(NOT ${LIBRARY_NAME1}_INSTALL_FOLDER)
+    SET(${LIBRARY_NAME1}_INSTALL_FOLDER ${LIBRARY_NAME1})    
+  ENDIF(NOT ${LIBRARY_NAME1}_INSTALL_FOLDER)
+  
   SET(${LIBRARY_NAME1}_LIBRARIES ${LIBRARY_NAME1})
   
   FILE(RELATIVE_PATH 
@@ -307,7 +312,10 @@ MACRO(CREA_INSTALL_LIBRARY_FOR_CMAKE LIBRARY_NAME1)
 #     ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}/Release)
     SET(${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin)
   ENDIF(UNIX)
-  SET(${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME1})
+
+  IF(NOT ${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS)
+    SET(${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME1})
+  ENDIF(NOT ${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS)
   
   # Invoke the advanced macro
   CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME1})