King_DuckZ/cmake-d
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Phobos dmd linux fixes

Browse source 
Added check that if a stdlib isn't found and the project needs it an
error message is printed
This commit is contained in:
flithm 2007-08-28 18:29:14 +00:00
parent 4dce6b3a41
commit 51095a9d7d
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmaked/CMakeDInformation.cmake
View file

@ -158,7 +158,7 @@ IF(CMAKE_D_USE_PHOBOS)
SET(DSTDLIB_FLAGS "-lgphobos") SET(DSTDLIB_FLAGS "-lgphobos")
ELSE(CMAKE_COMPILER_IS_GDC) ELSE(CMAKE_COMPILER_IS_GDC)
SET(DSTDLIB_TYPE "-version=Phobos") SET(DSTDLIB_TYPE "-version=Phobos")
SET(DSTDLIB_FLAGS "-L${D_PATH}/lib -ltango -lphobos") SET(DSTDLIB_FLAGS "-L${D_PATH}/lib -lphobos")
ENDIF(CMAKE_COMPILER_IS_GDC) ENDIF(CMAKE_COMPILER_IS_GDC)
ENDIF(CMAKE_D_USE_PHOBOS) ENDIF(CMAKE_D_USE_PHOBOS)

9
cmaked/CMakeTestDCompiler.cmake
View file

@ -158,3 +158,12 @@ ELSE(NOT CMAKE_D_TANGO_WORKS)
ENDIF(C_TEST_WAS_RUN) ENDIF(C_TEST_WAS_RUN)
SET(CMAKE_D_TANGO_WORKS 1 CACHE INTERNAL "") SET(CMAKE_D_TANGO_WORKS 1 CACHE INTERNAL "")
ENDIF(NOT CMAKE_D_TANGO_WORKS) ENDIF(NOT CMAKE_D_TANGO_WORKS)
# ensure the user has the appropriate std lib available
IF(CMAKE_D_USE_TANGO AND NOT CMAKE_D_TANGO_WORKS)
MESSAGE(FATAL_ERROR "Tango is required for this project, but it is not available!")
ENDIF(CMAKE_D_USE_TANGO AND NOT CMAKE_D_TANGO_WORKS)
IF(CMAKE_D_USE_PHOBOS AND NOT CMAKE_D_PHOBOS_WORKS)
MESSAGE(FATAL_ERROR "Phobos is required for this project, but it is not available!")
ENDIF(CMAKE_D_USE_PHOBOS AND NOT CMAKE_D_PHOBOS_WORKS)

2
samples/minwin_gtk/minwin/gtk.d
View file

@ -1470,7 +1470,7 @@ extern (C) {
} }
struct _GSourceCallbackFuncs { struct _GSourceCallbackFuncs {
void (*ref) (gpointer cb_data); void (*theRef) (gpointer cb_data);
void (*unref) (gpointer cb_data); void (*unref) (gpointer cb_data);
void (*get) (gpointer cb_data, void (*get) (gpointer cb_data,
GSource *source, GSource *source,