소스 검색

backed out change to include/lib install dir location

Bill McCormick 7 년 전
부모
커밋
3e59dac3d8
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      source/buildsupport/POSIX/OpENer_PLATFORM_INCLUDES.cmake

+ 2 - 2
source/buildsupport/POSIX/OpENer_PLATFORM_INCLUDES.cmake

@@ -2,10 +2,10 @@ macro(opener_platform_spec)
   include_directories(${PORTS_SRC_DIR}/${OpENer_PLATFORM} ${PORTS_SRC_DIR}/${OpENer_PLATFORM}/sample_application)
   include_directories(${PORTS_SRC_DIR}/${OpENer_PLATFORM} ${PORTS_SRC_DIR}/${OpENer_PLATFORM}/sample_application)
   set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Werror=implicit-function-declaration" )
   set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Werror=implicit-function-declaration" )
   if(NOT CMAKE_INSTALL_LIBDIR)
   if(NOT CMAKE_INSTALL_LIBDIR)
-    set( CMAKE_INSTALL_LIBDIR "lib/OpENer")
+    set( CMAKE_INSTALL_LIBDIR "lib")
   endif()
   endif()
   if(NOT CMAKE_INSTALL_INCLUDEDIR )
   if(NOT CMAKE_INSTALL_INCLUDEDIR )
-    set( CMAKE_INSTALL_INCLUDEDIR "include/OpENer")
+    set( CMAKE_INSTALL_INCLUDEDIR "include")
   endif()
   endif()
   add_definitions( -D_POSIX_C_SOURCE=200112L -D__USE_GNU -D__USE_XOPEN2K -DOPENER_POSIX)
   add_definitions( -D_POSIX_C_SOURCE=200112L -D__USE_GNU -D__USE_XOPEN2K -DOPENER_POSIX)
   get_property(languages GLOBAL PROPERTY ENABLED_LANGUAGES)
   get_property(languages GLOBAL PROPERTY ENABLED_LANGUAGES)