hust-marx / firebreath

Automatically exported from code.google.com/p/firebreath
0 stars 0 forks source link

cmake script ignores WITH_SYSTEM_BOOST=ON and add include_dir = src/3rdParty/boost #59

Open GoogleCodeExporter opened 9 years ago

GoogleCodeExporter commented 9 years ago
version from trunk

fgrep -rsn BOOST_SOURCE_DIR *                                                   

cmake/common.cmake:56:    set(Boost_INCLUDE_DIRS ${BOOST_SOURCE_DIR})           

cmake/paths.cmake:15:set (BOOST_SOURCE_DIR ${SOURCE_DIR}/3rdParty/boost)        

src/NpapiPlugin/CMakeLists.txt:33:    ${BOOST_SOURCE_DIR}                       

src/PluginWindow/CMakeLists.txt:33:    ${BOOST_SOURCE_DIR} 

We should use Boost_INCLUDE_DIRS. 

#hg diff src/PluginWindow/CMakeLists.txt                                        

diff -r a2f612b5eedd src/PluginWindow/CMakeLists.txt                            

--- a/src/PluginWindow/CMakeLists.txt   Wed Aug 11 00:03:36 2010 +0200          

+++ b/src/PluginWindow/CMakeLists.txt   Fri Aug 13 13:14:00 2010 +0400          

@@ -30,7 +30,7 @@                                                               

     ${GEN_DIR}/gen                                                                                                                               
     ${PLUGINCORE_SOURCE_DIR}                                                                                                                     
     ${FIREBREATH_CONFIG_DIR}                                                                                                                     
-    ${BOOST_SOURCE_DIR}                                                        

+    ${Boost_INCLUDE_DIRS}                                                      

     )                                                                                                                             

                                                                                  #file (GLOB PLUGINWINDOW RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 

# hg diff src/NpapiPlugin/CMakeLists.txt                                        

diff -r a2f612b5eedd src/NpapiPlugin/CMakeLists.txt                             

--- a/src/NpapiPlugin/CMakeLists.txt    Wed Aug 11 00:03:36 2010 +0200          

+++ b/src/NpapiPlugin/CMakeLists.txt    Fri Aug 13 13:14:32 2010 +0400          

@@ -30,7 +30,6 @@                                                               

     ${GEN_DIR}/gen                                                                                                                               
     ${SCRIPTINGCORE_SOURCE_DIR}                                                                                                                  
     ${FIREBREATH_CONFIG_DIR}                                                                                                                     
-    ${BOOST_SOURCE_DIR}                                                        

     ${PLUGINWINDOW_SOURCE_DIR}                                                                                                                   
     ${Boost_INCLUDE_DIRS}                                                                                                                        
     )                                

Original issue reported on code.google.com by bignikita on 13 Aug 2010 at 9:17

GoogleCodeExporter commented 9 years ago
nikita, could you make these changes in a firebreath clone and tell us where 
they are?  That way you can test it and we'll know that we got all of the 
needed changes

Original comment by taxilian on 13 Aug 2010 at 1:32

GoogleCodeExporter commented 9 years ago
If i correctly understand how to work with mercural, there is the clone with 
changes 
 https://bignikita-issue59-fix.googlecode.com/hg/ 

Original comment by bignikita on 13 Aug 2010 at 9:22

GoogleCodeExporter commented 9 years ago
This has been merged in with revision d0dc55e82f

Спасибо болшое =)  Это всегда легче принят 
пач, когда это уже находится в Google Code.

Original comment by taxilian on 13 Aug 2010 at 10:56