]> Creatis software - crea.git/commitdiff
*** empty log message ***
authorguigues <guigues>
Wed, 1 Oct 2008 09:55:48 +0000 (09:55 +0000)
committerguigues <guigues>
Wed, 1 Oct 2008 09:55:48 +0000 (09:55 +0000)
CMakeLists.txt
cmake/CREAMacro_AddWxExecutable.cmake
src/CMakeLists.txt
src/creaWx.h

index a87f8ec1dd87bfc63a042916a304d25b6db8305a..0483454b7e2849da0e21fec201096fa4d17d6002 100644 (file)
@@ -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()
index 4fdd9eba48a0ca9336c9db3036c0e36a93d61829..d3f5556654a9e66204d50481057a829304011b2c 100644 (file)
@@ -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)
 
 
index c6723c2b6efc06a836d5df501400f79c10c0ec74..bb6ece731638e60bfe4c0d979a9b44a4f6151279 100644 (file)
@@ -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)
index 29fb0619f09ec2c72aafe29335bd9f42a5a95eaa..eee7414a4a737dabcb0e9bc3b5372aa6b4236fce 100644 (file)
@@ -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)