Menu
▾
▴
[Wxlua-commit] wxLua/build CMakeFunctions.txt, 1.1, 1.2 CMakewxAppLib.cmake, 1.1, 1.2
|
From: John L. <jr...@us...> - 2011-10-29 06:45:20
|
Update of /cvsroot/wxlua/wxLua/build
In directory vz-cvs-4.sog:/tmp/cvs-serv29908/build
Modified Files:
CMakeFunctions.txt CMakewxAppLib.cmake
Log Message:
Build fixes for CMake and dlls.
Deselect the old item in the wxLuaStack listctrl when selected from the tree.
Index: CMakeFunctions.txt
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/CMakeFunctions.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CMakeFunctions.txt 20 Oct 2011 03:57:04 -0000 1.1
--- CMakeFunctions.txt 29 Oct 2011 06:45:18 -0000 1.2
***************
*** 136,140 ****
string(REPLACE ".cpp" ".obj" fname2 ${fname})
string(REPLACE ".c" ".obj" fname2 ${fname2})
! set(objects ${objects} "${CMAKE_CURRENT_BINARY_DIR}/${target_name}.dir/${CMAKE_CFG_INTDIR}/${fname2}")
endforeach()
else()
--- 136,144 ----
string(REPLACE ".cpp" ".obj" fname2 ${fname})
string(REPLACE ".c" ".obj" fname2 ${fname2})
! if (MSVC60)
! set(objects ${objects} "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${fname2}")
! else()
! set(objects ${objects} "${CMAKE_CURRENT_BINARY_DIR}/${target_name}.dir/${CMAKE_CFG_INTDIR}/${fname2}")
! endif()
endforeach()
else()
***************
*** 482,488 ****
# Set the install includes to use same dir structure as the source directories
! STRING(REPLACE "${CMAKE_HOME_DIRECTORY}/" "" PROJ_DIR_TEMP ${CMAKE_CURRENT_SOURCE_DIR})
!
! INSTALL(FILES ${HEADER_FILES} DESTINATION "include/${PROJ_DIR_TEMP}")
INSTALL(TARGETS ${target_name}
--- 486,492 ----
# Set the install includes to use same dir structure as the source directories
! #STRING(REPLACE "${CMAKE_HOME_DIRECTORY}/" "" PROJ_DIR_TEMP ${CMAKE_CURRENT_SOURCE_DIR})
! #INSTALL(FILES
! # ${HEADER_FILES} DESTINATION "include/${PROJ_DIR_TEMP}")
INSTALL(TARGETS ${target_name}
***************
*** 808,811 ****
--- 812,823 ----
function( TARGET_PRECOMPILED_HEADER target_name )
+ # There is some problem that makes MSVC6 recompile the precomp header
+ # and therefore every source file every build.
+ if (MSVC60)
+ MESSAGE(STATUS "* WARNING: Disabling precomplied headers for MSVC6 for ${target_name}, sorry...")
+ return()
+ endif()
+
+
# Allow people to en/disable precomp headers to test if it actually works or not.
# GCC is a little tricky to get right since you have to compile it exactly the same flags
***************
*** 879,883 ****
IF(MSVC)
get_filename_component(PCH_BASENAME ${_PCH_HEADER} NAME_WE)
! set(PCH_BINARY "${CMAKE_CURRENT_BINARY_DIR}/$(IntDir)/${PCH_BASENAME}.pch")
# need to delete this file for clean too, otherwise we can get errors
--- 891,896 ----
IF(MSVC)
get_filename_component(PCH_BASENAME ${_PCH_HEADER} NAME_WE)
! #set(PCH_BINARY "${CMAKE_CURRENT_BINARY_DIR}/$(IntDir)/${PCH_BASENAME}.pch")
! set(PCH_BINARY "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${PCH_BASENAME}.pch")
# need to delete this file for clean too, otherwise we can get errors
Index: CMakewxAppLib.cmake
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/CMakewxAppLib.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CMakewxAppLib.cmake 20 Oct 2011 03:57:04 -0000 1.1
--- CMakewxAppLib.cmake 29 Oct 2011 06:45:18 -0000 1.2
***************
*** 47,51 ****
message( STATUS "* " )
message( STATUS "* In the CMake GUI you can set values and press configure a few times since " )
! message( STATUS "* sometimes once is not enough, once it works, press generate." )
message( STATUS "* " )
message( STATUS "* Usage: cmake -D[OPTION_NAME]=[OPTION_VALUE] /path/to/CMakeLists.txt/" )
--- 47,51 ----
message( STATUS "* " )
message( STATUS "* In the CMake GUI you can set values and press configure a few times since " )
! message( STATUS "* sometimes once is not enough, after a few configurations, press generate." )
message( STATUS "* " )
message( STATUS "* Usage: cmake -D[OPTION_NAME]=[OPTION_VALUE] /path/to/CMakeLists.txt/" )
***************
*** 142,146 ****
# ---------------------------------------------------------------------------
! set( CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Install Directory prefix for INSTALL target" FORCE)
# ---------------------------------------------------------------------------
--- 142,152 ----
# ---------------------------------------------------------------------------
! if (NOT DEFINED BUILD_INSTALL_PREFIX)
! # CMake defaults to C:/Program Files and /usr/local neither of which normal users have permissions to
! set( BUILD_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/install" )
! endif()
!
! set( BUILD_INSTALL_PREFIX ${BUILD_INSTALL_PREFIX} CACHE PATH "Install Directory prefix for INSTALL target" FORCE)
! set( CMAKE_INSTALL_PREFIX ${BUILD_INSTALL_PREFIX})
# ---------------------------------------------------------------------------
***************
*** 148,157 ****
# ---------------------------------------------------------------------------
! if (CMAKE_SIZEOF_VOID_P MATCHES 4)
set(IS_32_BIT TRUE)
set(IS_64_BIT FALSE)
! else()
set(IS_32_BIT FALSE)
set(IS_64_BIT TRUE)
endif()
--- 154,165 ----
# ---------------------------------------------------------------------------
! if ((CMAKE_SIZEOF_VOID_P MATCHES 4) OR (CMAKE_CL_64 MATCHES 0))
set(IS_32_BIT TRUE)
set(IS_64_BIT FALSE)
! elseif((CMAKE_SIZEOF_VOID_P MATCHES 8) OR (CMAKE_CL_64 MATCHES 1))
set(IS_32_BIT FALSE)
set(IS_64_BIT TRUE)
+ else()
+ MESSAGE(WARNING "Oops, unable to determine if using 32 or 64 bit compilation.")
endif()
***************
*** 260,276 ****
# -----------------------------------------------------------------------
! # Use multiprocessor compliation if availiable
# In some cases it is nice to turn it off since it can be hard tell where some
# pragma warnings come from if multiple files are compiled at once.
- if (NOT DEFINED BUILD_USE_MULTIPROCESSOR)
- set(BUILD_USE_MULTIPROCESSOR TRUE)
- endif()
! set(BUILD_USE_MULTIPROCESSOR ${BUILD_USE_MULTIPROCESSOR} CACHE BOOL "Build in MSVC using multiple processors (TRUE) else single processor (FALSE)" FORCE)
! if (BUILD_USE_MULTIPROCESSOR)
! add_definitions( /MP )
! endif()
elseif (UNIX) # elseif (CMAKE_BUILD_TOOL MATCHES "(gmake)")
--- 268,286 ----
# -----------------------------------------------------------------------
! # Use multiprocessor compliation if MSVC > ver 6
# In some cases it is nice to turn it off since it can be hard tell where some
# pragma warnings come from if multiple files are compiled at once.
! if ("${MSVC_VERSION}" GREATER "1200")
! if (NOT DEFINED BUILD_USE_MULTIPROCESSOR)
! set(BUILD_USE_MULTIPROCESSOR TRUE)
! endif()
! set(BUILD_USE_MULTIPROCESSOR ${BUILD_USE_MULTIPROCESSOR} CACHE BOOL "Build in MSVC using multiple processors (TRUE) else single processor (FALSE)" FORCE)
+ if (BUILD_USE_MULTIPROCESSOR)
+ add_definitions( /MP )
+ endif()
+ endif()
elseif (UNIX) # elseif (CMAKE_BUILD_TOOL MATCHES "(gmake)")
***************
*** 452,462 ****
foreach( wx_comp ${wxWidgets_COMPONENTS} )
! set(wx_comp_found FALSE)
foreach( wx_comp_lib ${wxWidgets_LIBRARIES} )
get_filename_component(wx_comp_lib_name ${wx_comp_lib} NAME_WE)
! string(REGEX MATCH ${wx_comp_lib_name} ${wx_comp} wx_comp_found)
! if (wx_comp_found)
! string(REGEX MATCH ${wx_comp_lib_name} "wx" wx_comp_found)
! if (wx_comp_found)
break()
endif()
--- 462,480 ----
foreach( wx_comp ${wxWidgets_COMPONENTS} )
! set(wx_comp_found "-1")
!
foreach( wx_comp_lib ${wxWidgets_LIBRARIES} )
+ if ("${wx_comp}" STREQUAL "mono")
+ if (WX_mono OR WX_monod)
+ set(wx_comp_found "1")
+ break()
+ endif()
+ endif()
+
get_filename_component(wx_comp_lib_name ${wx_comp_lib} NAME_WE)
! string(FIND ${wx_comp_lib_name} ${wx_comp} wx_comp_found)
! if ("${wx_comp_found}" GREATER "-1")
! string(FIND ${wx_comp_lib_name} "wx" wx_comp_found)
! if ("${wx_comp_found}" GREATER "-1")
break()
endif()
***************
*** 464,469 ****
endforeach()
! if (wx_comp_found)
! message(STATUS "* WARNING: Unable to find requested wxWidgets component : ${wx_comp}")
endif()
endforeach()
--- 482,487 ----
endforeach()
! if ("${wx_comp_found}" LESS "0")
! message(" WARNING: Unable to find requested wxWidgets component : ${wx_comp}")
endif()
endforeach()
|
