Skip to content
Snippets Groups Projects
Commit cddb8a55 authored by Mederic Fourmy's avatar Mederic Fourmy
Browse files

Fix config.h creation after having broken it

parent e2dde8d4
No related branches found
No related tags found
1 merge request!1Resolve "Adapt to core cmake refactor"
...@@ -67,11 +67,6 @@ if(BUILD_TESTS) ...@@ -67,11 +67,6 @@ if(BUILD_TESTS)
endif() endif()
#CMAKE modules
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules")
MESSAGE(STATUS ${CMAKE_MODULE_PATH})
# Some wolf compilation options # Some wolf compilation options
IF((CMAKE_BUILD_TYPE MATCHES DEBUG) OR (CMAKE_BUILD_TYPE MATCHES debug) OR (CMAKE_BUILD_TYPE MATCHES Debug)) IF((CMAKE_BUILD_TYPE MATCHES DEBUG) OR (CMAKE_BUILD_TYPE MATCHES debug) OR (CMAKE_BUILD_TYPE MATCHES Debug))
...@@ -80,15 +75,9 @@ ENDIF() ...@@ -80,15 +75,9 @@ ENDIF()
option(_WOLF_TRACE "Enable wolf tracing macro" ON) option(_WOLF_TRACE "Enable wolf tracing macro" ON)
# Does this has any other interest set(_WOLF_ROOT_DIR ${CMAKE_SOURCE_DIR})
# but for the examples ? # variable used to compile the config.h.in file
# yes, for the tests ! string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)
IF(BUILD_DEMOS OR BUILD_TESTS)
string(TOUPPER ${PROJECT_NAME} UPPER_NAME)
set(_WOLF_ROOT_DIR ${CMAKE_SOURCE_DIR})
ENDIF(BUILD_DEMOS OR BUILD_TESTS)
#find dependencies. #find dependencies.
# ============EXAMPLE================== # ============EXAMPLE==================
......
...@@ -24,13 +24,13 @@ ...@@ -24,13 +24,13 @@
// which will be added to the include path for compilation, // which will be added to the include path for compilation,
// and installed with the public wolf headers. // and installed with the public wolf headers.
#ifndef WOLF_INTERNAL_${UPPER_NAME}_CONFIG_H_ #ifndef WOLF_INTERNAL_${PROJECT_NAME_UPPER}_CONFIG_H_
#define WOLF_INTERNAL_${UPPER_NAME}_CONFIG_H_ #define WOLF_INTERNAL_${PROJECT_NAME_UPPER}_CONFIG_H_
#cmakedefine _WOLF_DEBUG #cmakedefine _WOLF_DEBUG
#cmakedefine _WOLF_TRACE #cmakedefine _WOLF_TRACE
#define _WOLF_${UPPER_NAME}_ROOT_DIR "${_WOLF_ROOT_DIR}" #define _WOLF_${PROJECT_NAME_UPPER}_ROOT_DIR "${_WOLF_ROOT_DIR}"
#endif /* WOLF_INTERNAL_CONFIG_H_ */ #endif /* WOLF_INTERNAL_CONFIG_H_ */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment