[Tora-cvs] SF.net SVN: tora:[4089] trunk/tora/src/trotl

[<ibr...@us...>]

Revision: 4089
          http://tora.svn.sourceforge.net/tora/?rev=4089&view=rev
Author:   ibre5041
Date:     2011-09-19 11:54:35 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
Fixes for compilation on MSVC Express 2010

Modified Paths:
--------------
    trunk/tora/src/trotl/CMakeLists.txt
    trunk/tora/src/trotl/src/CMakeLists.txt

Modified: trunk/tora/src/trotl/CMakeLists.txt
===================================================================
--- trunk/tora/src/trotl/CMakeLists.txt	2011-09-19 11:49:25 UTC (rev 4088)
+++ trunk/tora/src/trotl/CMakeLists.txt	2011-09-19 11:54:35 UTC (rev 4089)
@@ -38,21 +38,21 @@
 
 SET (LIB_NAME "trotl")
 
-IF (CMAKE_COMPILER_IS_GNUCC)  
-    SET(CXX_WARNINGS "-Wall")
-    SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -rdynamic -fvisibility-inlines-hidden")
-    SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -rdynamic -fvisibility-inlines-hidden")
-    SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb3 -fno-inline ${CXX_WARNINGS} -fstrict-aliasing -rdynamic")
-    SET(CMAKE_C_FLAGS_DEBUG "-O0 -ggbb3 -fno-inline ${CXX_WARNINGS} -fstrict-aliasing -rdynamic")
-ENDIF (CMAKE_COMPILER_IS_GNUCC)  
+# IF (CMAKE_COMPILER_IS_GNUCC)  
+#     SET(CXX_WARNINGS "-Wall")
+#     SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -rdynamic -fvisibility-inlines-hidden")
+#     SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -rdynamic -fvisibility-inlines-hidden")
+#     SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb3 -fno-inline ${CXX_WARNINGS} -fstrict-aliasing -rdynamic")
+#     SET(CMAKE_C_FLAGS_DEBUG "-O0 -ggbb3 -fno-inline ${CXX_WARNINGS} -fstrict-aliasing -rdynamic")
+# ENDIF (CMAKE_COMPILER_IS_GNUCC)  
 
 # Lets disable Wall warnings due the MSVC too much talkative
 # output.
 # MSVC, MSVC_IDE, MSVC60, MSVC70, MSVC71, MSVC80, CMAKE_COMPILER_2005
 IF (MSVC)
+    ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS )
     SET (CXX_WARNINGS "/wd4251")
-    ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS )
-    SET (CMAKE_CXX_FLAGS_DEBUG ${CXX_WARNINGS})
+    SET (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${CXX_WARNINGS}")
 
 #	SET (CMAKE_SHARED_LINKER_FLAGS "/INCREMENTAL:NO")
 #	SET (CMAKE_SHARED_LINKER_FLAGS_DEBUG "/INCREMENTAL:NO")

Modified: trunk/tora/src/trotl/src/CMakeLists.txt
===================================================================
--- trunk/tora/src/trotl/src/CMakeLists.txt	2011-09-19 11:49:25 UTC (rev 4088)
+++ trunk/tora/src/trotl/src/CMakeLists.txt	2011-09-19 11:54:35 UTC (rev 4089)
@@ -1,5 +1,5 @@
-SET(TROTL_DLL_DEFINES "-DLOKI_STATIC -DEXPLICIT_EXPORT -DTROTL_MAKE_DLL")
-SET(TROTL_CLIENT_DEFINES "-DLOKI_STATIC -DEXPLICIT_EXPORT -DTROTL_DLL")
+SET(TROTL_DLL_DEFINES    -DLOKI_STATIC -DEXPLICIT_EXPORT -DTROTL_MAKE_DLL)
+SET(TROTL_CLIENT_DEFINES -DLOKI_STATIC -DEXPLICIT_EXPORT -DTROTL_DLL)
 
 INCLUDE_DIRECTORIES(
   ${ORACLE_INCLUDES}
@@ -35,22 +35,7 @@
   LIST(APPEND TROTL_SOURCES trotl_xml.cpp)
 ENDIF (ORACLE_HAS_XML)
 
-
-#IF(WIN32)
-#    IF (MSVC)
-#        # this is a must to switch off subsystem:console (console window poping up)
-#        # WinMain wrapper from QT_QTMAIN_LIBRARY is used and liner must be modified
-#        LINK_LIBRARIES(${QT_QTMAIN_LIBRARY})
-#        SET (WIN32_SUBSYSTEM WIN32)
-#		IF (WANT_DEBUG)
-#	        SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrtd.lib ${CMAKE_EXE_LINKER_FLAGS}")
-#		ELSE (WANT_DEBUG)
-#            SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrt.lib ${CMAKE_EXE_LINKER_FLAGS}")
-#		ENDIF (WANT_DEBUG)
-#    ENDIF (MSVC)
-#ENDIF(WIN32)
-
-SET_SOURCE_FILES_PROPERTIES(${TROTL_SOURCES} COMPILE_FLAGS ${TROTL_DLL_DEFINES})
+ADD_DEFINITIONS(${TROTL_DLL_DEFINES})
 ADD_LIBRARY(${LIB_NAME} SHARED ${TROTL_SOURCES})
 TARGET_LINK_LIBRARIES(${LIB_NAME} ${ORACLE_LIBRARIES} ${STACK_LIB})
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.