Changeset 15

Timestamp:

08/28/07 07:19:05 (1 year ago)

Author:

flithm

Message:

More windows fixes

Files:

• trunk/cmaked/CMakeDInformation.cmake (modified) (2 diffs)
• trunk/cmaked/CMakeTestDCompiler.cmake (modified) (2 diffs)
• trunk/cmaked/Platform/Windows-dmd.cmake (modified) (1 diff)
• trunk/cmaked/Platform/Windows-gdc.cmake (modified) (1 diff)

trunk/cmaked/CMakeDInformation.cmake

@@ -127 +127 @@
-ELSE(CMAKE_COMPILER_IS_GDC)
-  SET(CMAKE_OUTPUT_D_FLAG "-of")
+  SET(CMAKE_D_VERSION_FLAG "-version=")
-  IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-    SET(CMAKE_LINK_LIBRARY_FLAG "-L+")
@@ -138 +139 @@
-    SET(CMAKE_LIBRARY_PATH_FLAG "-L")
-    SET(CMAKE_LINK_LIBRARY_FLAG "-l")
-    SET(CMAKE_D_VERSION_FLAG "-version=")
-  ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-ENDIF(CMAKE_COMPILER_IS_GDC)

trunk/cmaked/CMakeTestDCompiler.cmake

@@ -85 +85 @@
-         OUTPUT_VARIABLE OUTPUT) 
-  ELSE(CMAKE_COMPILER_IS_GDC)
-
-
-
-
+
+
+
+
+
+
+
+
+
-  ENDIF(CMAKE_COMPILER_IS_GDC)
-  SET(C_TEST_WAS_RUN 1)
@@ -120 +125 @@
-         OUTPUT_VARIABLE OUTPUT) 
-  ELSE(CMAKE_COMPILER_IS_GDC)
+      IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+      TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+         OUTPUT_VARIABLE OUTPUT) 
+      ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-      TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
-         CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libtango.a;${D_PATH}/lib/libphobos.a"
-         COMPILE_DEFINITIONS "-I${D_PATH}/include -I${D_PATH}/import"
-         OUTPUT_VARIABLE OUTPUT) 
+      ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-  ENDIF(CMAKE_COMPILER_IS_GDC)
-  SET(C_TEST_WAS_RUN 1)

trunk/cmaked/Platform/Windows-dmd.cmake

@@ -26 +26 @@
-ENDIF(CMAKE_D_BUILD_DOCS)
-
-Posix ${DSTDLIB_FLAGS} -I$ENV{D_PATH}/include -I$ENV{D_PATH}/import
+Win ${DSTDLIB_FLAGS}
-SET (CMAKE_D_FLAGS_DEBUG_INIT "-g ${DDOC_FLAGS}")
-#  SET (CMAKE_D_FLAGS_MINSIZEREL_INIT "-Os ${DDOC_FLAGS}")

trunk/cmaked/Platform/Windows-gdc.cmake

@@ -26 +26 @@
-ENDIF(CMAKE_D_BUILD_DOCS)
-
-Posix
+Win
-SET (CMAKE_D_FLAGS_DEBUG_INIT "-g ${DDOC_FLAGS}")
-SET (CMAKE_D_FLAGS_MINSIZEREL_INIT "-Os ${DDOC_FLAGS}")