| 1 |
diff -ruN apvlv-0.1.4-Source/src/CMakeLists.txt my/src/CMakeLists.txt
|
| 2 |
--- apvlv-0.1.4-Source/src/CMakeLists.txt 2012-06-13 05:44:28.000000000 +0200
|
| 3 |
+++ my/src/CMakeLists.txt 2012-07-17 00:32:53.782141814 +0200
|
| 4 |
@@ -1,23 +1,18 @@
|
| 5 |
IF (WIN32)
|
| 6 |
ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS)
|
| 7 |
ELSE (WIN32)
|
| 8 |
- SET (CMAKE_CXX_FLAGS "-Wall -fno-strict-aliasing")
|
| 9 |
-
|
| 10 |
- OPTION (APVLV_ENABLE_DEBUG "If build binary with debug infomations." OFF)
|
| 11 |
- IF (APVLV_ENABLE_DEBUG)
|
| 12 |
- SET (CMAKE_CXX_FLAGS "-D_DEBUG -g ${CMAKE_CXX_FLAGS}")
|
| 13 |
- ELSE (APVLV_ENABLE_DEBUG)
|
| 14 |
- SET (CMAKE_CXX_FLAGS "-O2 ${CMAKE_CXX_FLAGS}")
|
| 15 |
- ENDIF (APVLV_ENABLE_DEBUG)
|
| 16 |
+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
|
| 17 |
ENDIF (WIN32)
|
| 18 |
|
| 19 |
FIND_PACKAGE (PkgConfig)
|
| 20 |
|
| 21 |
-PKG_CHECK_MODULES (FREETYPE2 freetype2 REQUIRED)
|
| 22 |
PKG_CHECK_MODULES (GTK2 gtk+-2.0 REQUIRED)
|
| 23 |
PKG_CHECK_MODULES (GLIB2 glib-2.0 REQUIRED)
|
| 24 |
PKG_CHECK_MODULES (GTHREAD2 gthread-2.0 REQUIRED)
|
| 25 |
-PKG_CHECK_MODULES (WEBKIT1 webkit-1.0 QUIET)
|
| 26 |
+
|
| 27 |
+IF (APVLV_WITH_HTML)
|
| 28 |
+ PKG_CHECK_MODULES (WEBKIT1 webkit-1.0 REQUIRED)
|
| 29 |
+ENDIF (APVLV_WITH_HTML)
|
| 30 |
INCLUDE_DIRECTORIES (${FREETYPE2_INCLUDE_DIRS}
|
| 31 |
${GTK2_INCLUDE_DIRS}
|
| 32 |
${GLIB2_INCLUDE_DIRS}
|
Parent Directory
| 
Revision Log