From 757d5fcb925e1e64e5da7ccac647c9fcc18d2a64 Mon Sep 17 00:00:00 2001 From: guigues Date: Wed, 1 Oct 2008 09:55:48 +0000 Subject: [PATCH] *** empty log message *** --- CMakeLists.txt | 2 +- cmake/CREAMacro_AddWxExecutable.cmake | 7 +++++++ src/CMakeLists.txt | 7 ++++++- src/creaWx.h | 4 ++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a87f8ec..0483454 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ INCLUDE(${CREA_CMAKE_DIR}/CREAMacros.cmake) CREA_PREVENT_IN_SOURCE_BUILD() SET(USE_VTK ON) -SET(USE_BOOST ON) +#SET(USE_BOOST ON) SET(USE_WXWIDGETS ON) CREA_FIND_AND_USE_LIBRARIES() diff --git a/cmake/CREAMacro_AddWxExecutable.cmake b/cmake/CREAMacro_AddWxExecutable.cmake index 4fdd9eb..d3f5556 100644 --- a/cmake/CREAMacro_AddWxExecutable.cmake +++ b/cmake/CREAMacro_AddWxExecutable.cmake @@ -1,3 +1,10 @@ +#Generates the cmake commands to build and install the executable EXE_NAME. +# ${EXE_NAME}_SOURCES must contain the list of files to compile +# to build the executable. +# ${EXE_NAME}_LINK_LIBRARIES must contain the list of libraries to link with +# +# On Windows, if ${EXE_NAME}_CONSOLE is set to TRUE +# then the application will have a console attached. MACRO(CREA_ADD_WX_EXECUTABLE EXE_NAME) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c6723c2..bb6ece7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -56,9 +56,14 @@ TARGET_LINK_LIBRARIES(crea # INSTALLS LIBRARY FILE(GLOB crea_HEADERS "*.h") INSTALL( - FILES ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/creaConfigure.h + FILES ${crea_HEADERS} DESTINATION include/crea ) +INSTALL( + FILES ${CMAKE_CURRENT_BINARY_DIR}/creaConfigure.h + DESTINATION include/crea + ) + INSTALL( TARGETS crea DESTINATION lib) diff --git a/src/creaWx.h b/src/creaWx.h index 29fb061..eee7414 100644 --- a/src/creaWx.h +++ b/src/creaWx.h @@ -40,6 +40,7 @@ typedef void wxWindow; #if defined(_WIN32) + // How to have a Console and wxWidgets // http://www.wxwidgets.org/wiki/index.php/MSVC_Setup_Guide // In Visual C++ 6 (7 should be similar), to create an application that is both a console application @@ -51,8 +52,11 @@ typedef void wxWindow; return WinMain(::GetModuleHandle(NULL), NULL, \ ::GetCommandLine(), SW_SHOWNORMAL); \ } + #else // defined(_WIN32) + #define CREA_WXMAIN_WITH_CONSOLE + #endif // defined(_WIN32) -- 2.45.1