*** empty log message ***

diff --git a/cmake/CREAMacro_InstallLibraryForCMake.cmake b/cmake/CREAMacro_InstallLibraryForCMake.cmake
index 12a434eadea5e7353ff99157c613ac819420b65c..4f0eae1888254a3c21328d4d2b59a277c3b8ea87 100644 (file)
--- a/cmake/CREAMacro_InstallLibraryForCMake.cmake
+++ b/cmake/CREAMacro_InstallLibraryForCMake.cmake
@@ -270,9 +270,15 @@ MACRO(CREA_INSTALL_LIBRARY_FOR_CMAKE LIBRARY_NAME1)
     ${LIBRARY_NAME1}_BUILD_TREE_RELATIVE_INCLUDE_PATHS 
     ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
     )
-  FILE(RELATIVE_PATH 
-    CILFC_EXECUTABLE_OUTPUT_REL_PATH
-    ${PROJECT_BINARY_DIR} ${EXECUTABLE_OUTPUT_PATH})
+  IF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
+    SET(CILFC_EXECUTABLE_OUTPUT_REL_PATH ".")
+  ELSE ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
+
+    FILE(RELATIVE_PATH 
+      CILFC_EXECUTABLE_OUTPUT_REL_PATH
+      ${PROJECT_BINARY_DIR} ${EXECUTABLE_OUTPUT_PATH})
+  ENDIF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
+
 
   IF(UNIX)
     SET(${LIBRARY_NAME1}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 

diff --git a/cmake/CREAMacro_wxWidgets.cmake b/cmake/CREAMacro_wxWidgets.cmake
index 765ddf8614eee206bd9323c89336ae9a67d93b79..56bde2df4f2c82413765d96b0fdac277dec0aa2a 100644 (file)
--- a/cmake/CREAMacro_wxWidgets.cmake
+++ b/cmake/CREAMacro_wxWidgets.cmake
@@ -35,14 +35,12 @@ MACRO(CREA_FIND_WXWIDGETS)
     #MESSAGE("${GTK2_INCLUDE_DIRS}")
     # Can I require all my user to have the gl lib on linux, even if they do not really need it...
     SET(WXGLCANVASLIBS "gl")
-    # GTK2
- #   INCLUDE(${CREA_CMAKE_DIR}/FindGTK2_new.cmake)
-    # WX
-    # LG : Do not force but use what is installed !
-    # SET(wxWidgets_USE_LIBS base core gl)
-    #FIND_PACKAGE( GTK REQUIRED) 
-#    FIND_PACKAGE( wxWidgets REQUIRED) 
-    FIND_PACKAGE(wxWidgets COMPONENTS base core adv ${WXGLCANVASLIBS})
+    # aui ?
+    SET(WXAUILIBS "aui")
+    # LG : These options should be set by the user at top level of crea
+    FIND_PACKAGE(wxWidgets COMPONENTS base core adv 
+      ${WXAUILIBS}
+      ${WXGLCANVASLIBS})
     #
     IF(wxWidgets_FOUND)
       MESSAGE(STATUS "Looking for wxWidgets... found ${wxWidgets_CONFIG_EXECUTABLE}")