Skip to content
Browse files

I think I've fixed precompiled headers :)

  • Loading branch information...
1 parent a19e174 commit 3651d7af68fe9fa702c94c99d073f93751c9ad98 @Sukender committed Mar 30, 2012
Showing with 6 additions and 11 deletions.
  1. +3 −8 CMakeLists.txt
  2. +1 −1 CMakeModules/PrecompiledHeader.cmake
  3. +2 −2 src/CMakeLists.txt
View
11 CMakeLists.txt
@@ -1,7 +1,7 @@
# Pioneer CMake script
#
# By Sukender (Benoit Neil), from PVLE and OSG CMake scripts.
-# Licensing terms are compatible with GPL v3:
+# Licensing terms of all CMake scripts in the project are compatible with GPL v3:
# - For Sukender's part (new code, and code coming from PVLE): WTFPL v2
# - For code coming from OSG: LGPL v2
@@ -96,7 +96,6 @@ if (SHIPPED_DEPENDENCIES_PATH)
#SET(CMAKE_PREFIX_PATH "${SHIPPED_DEPENDENCIES_PATH}" ${CMAKE_PREFIX_PATH})
SET(CMAKE_LIBRARY_PATH "${SHIPPED_DEPENDENCIES_PATH}" "${SHIPPED_DEPENDENCIES_PATH}/lib" ${CMAKE_LIBRARY_PATH})
SET(CMAKE_INCLUDE_PATH "${SHIPPED_DEPENDENCIES_PATH}" "${SHIPPED_DEPENDENCIES_PATH}/include" ${CMAKE_INCLUDE_PATH})
- SET(ADDITIONAL_SEARCH_PATH "${SHIPPED_DEPENDENCIES_PATH}")
endif()
# SET(Boost_USE_STATIC_LIBS OFF)
@@ -164,10 +163,6 @@ IF(WIN32)
OPTION(${PROJECT_NAME}_FORCE_CONSOLE_APPS "Activate to make all apps to have a console under Windows" OFF)
ENDIF()
-IF(WIN32 AND NOT ${PROJECT_NAME}_FORCE_CONSOLE_APPS)
- MESSAGE("DEBUG MESSAGE: no console")
-endif()
-
#########################################################################
# Make the headers visible to everything
IF(NOT ${PROJECT_BINARY_DIR} EQUAL ${PROJECT_SOURCE_DIR})
@@ -186,8 +181,8 @@ INCLUDE_DIRECTORIES(
# Dependencies install
set(${PROJECT_NAME}_DEPENDENCIES_DIRS_DEFAULT "")
-if (WIN32)
- set(${PROJECT_NAME}_DEPENDENCIES_DIRS_DEFAULT "{PROJECT_SOURCE_DIR}/win32")
+if (SHIPPED_DEPENDENCIES_PATH)
+ set(${PROJECT_NAME}_DEPENDENCIES_DIRS_DEFAULT "${SHIPPED_DEPENDENCIES_PATH}/lib;${SHIPPED_DEPENDENCIES_PATH}/bin")
endif()
OPTION(${PROJECT_NAME}_INSTALL_DEPENDENCIES "Set to ON to search and copy direct dependencies of executables at install/package time." ON)
View
2 CMakeModules/PrecompiledHeader.cmake
@@ -3,7 +3,7 @@
# By Sukender (Benoit NEIL), under the terms of the WTFPL (see cooresponding license file)
FUNCTION(SET_USE_PRECOMPILED_HEADER TARGET_NAME H_NAME CPP_NAME) # PCH_NAME
- IF(MSVC AND VCTOOLS_USE_PRECOMPILED_HEADERS)
+ IF(MSVC AND ${PROJECT_NAME}_USE_PRECOMPILED_HEADERS)
GET_TARGET_PROPERTY(TEMP_PROPERTY ${TARGET_NAME} COMPILE_FLAGS)
IF(NOT TEMP_PROPERTY)
SET(TEMP_PROPERTY )
View
4 src/CMakeLists.txt
@@ -461,8 +461,8 @@ set(${TARGETNAME}_SRC_OTHER
IF (${PROJECT_NAME}_USE_PRECOMPILED_HEADERS)
- LIST(APPEND ${TARGETNAME}_H_base "${PCH_DEFAULT_H}")
- LIST(APPEND ${TARGETNAME}_SRC_base "${PCH_DEFAULT_CPP}")
+ LIST(APPEND ${TARGETNAME}_H_OTHER "${PCH_DEFAULT_H}")
+ LIST(APPEND ${TARGETNAME}_SRC_OTHER "${PCH_DEFAULT_CPP}")
ENDIF()
# Add and group sources (except "OTHER")

0 comments on commit 3651d7a

Please sign in to comment.
Something went wrong with that request. Please try again.